qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>,
	"Peter Puhov" <peter.puhov@linaro.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Robert Foley" <robert.foley@linaro.org>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>
Subject: [PATCH  v2 3/9] tests/vm: increased max timeout for vm boot.
Date: Tue,  3 Mar 2020 15:06:16 +0000	[thread overview]
Message-ID: <20200303150622.20133-4-alex.bennee@linaro.org> (raw)
In-Reply-To: <20200303150622.20133-1-alex.bennee@linaro.org>

From: Robert Foley <robert.foley@linaro.org>

Add change to increase timeout waiting for VM to boot.
Needed for some emulation cases where it can take longer
than 5 minutes to boot.

Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200219163537.22098-4-robert.foley@linaro.org>
---
 tests/vm/basevm.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index c99725b8c0d..5ca445e29af 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -57,6 +57,10 @@ class BaseVM(object):
     poweroff = "poweroff"
     # enable IPv6 networking
     ipv6 = True
+    # Scale up some timeouts under TCG.
+    # 4 is arbitrary, but greater than 2,
+    # since we found we need to wait more than twice as long.
+    tcg_ssh_timeout_multiplier = 4
     def __init__(self, debug=False, vcpus=None):
         self._guest = None
         self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
@@ -309,6 +313,9 @@ class BaseVM(object):
         sys.stderr.write("### %s ...\n" % text)
 
     def wait_ssh(self, seconds=300):
+        # Allow more time for VM to boot under TCG.
+        if not kvm_available(self.arch):
+            seconds *= self.tcg_ssh_timeout_multiplier
         starttime = datetime.datetime.now()
         endtime = starttime + datetime.timedelta(seconds=seconds)
         guest_up = False
-- 
2.20.1



  parent reply	other threads:[~2020-03-03 15:10 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-03 15:06 [PATCH v2 0/9] testing/next (buildvm and re-greening tweeks) Alex Bennée
2020-03-03 15:06 ` [PATCH v2 1/9] tests/vm: use $(PYTHON) consistently Alex Bennée
2020-03-03 15:06 ` [PATCH v2 2/9] tests/vm: Debug mode shows ssh output Alex Bennée
2020-03-03 15:06 ` Alex Bennée [this message]
2020-03-03 15:06 ` [PATCH v2 4/9] tests/vm: give wait_ssh() option to wait for root Alex Bennée
2020-03-03 15:06 ` [PATCH v2 5/9] tests/vm: Added gen_cloud_init_iso() to basevm.py Alex Bennée
2020-03-03 15:06 ` [PATCH v2 6/9] travis: enable tools build on OS X Alex Bennée
2020-03-03 15:06 ` [PATCH v2 7/9] configure: detect and report genisoimage Alex Bennée
2020-03-03 18:44   ` Richard Henderson
2020-03-03 15:06 ` [PATCH v2 8/9] tests/acceptance: bump avocado requirements to 76.0 Alex Bennée
2020-03-03 18:45   ` Richard Henderson
2020-03-03 15:06 ` [PATCH v2 9/9] travis.yml: install python3 numpy and opencv libraries Alex Bennée

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200303150622.20133-4-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=peter.puhov@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=robert.foley@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).