tests/vm: increased max timeout for vm boot.
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> Message-Id: <20200303150622.20133-4-alex.bennee@linaro.org>
This commit is contained in:
parent
89adc5b918
commit
c9de39355a
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user