[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 03/14] tests/vm: increased max timeout for vm boot.
From: |
Robert Foley |
Subject: |
[PATCH v2 03/14] tests/vm: increased max timeout for vm boot. |
Date: |
Wed, 19 Feb 2020 11:35:26 -0500 |
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 <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Reviewed-by: Peter Puhov <address@hidden>
---
tests/vm/basevm.py | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index c99725b8c0..5ca445e29a 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.17.1
- [PATCH v2 00/14] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/02/19
- [PATCH v2 01/14] tests/vm: use $(PYTHON) consistently, Robert Foley, 2020/02/19
- [PATCH v2 02/14] tests/vm: Debug mode shows ssh output., Robert Foley, 2020/02/19
- [PATCH v2 03/14] tests/vm: increased max timeout for vm boot.,
Robert Foley <=
- [PATCH v2 04/14] tests/vm: give wait_ssh() option to wait for root, Robert Foley, 2020/02/19
- [PATCH v2 05/14] tests/vm: Added gen_cloud_init_iso() to basevm.py, Robert Foley, 2020/02/19
- [PATCH v2 06/14] tests/vm: Add workaround to consume console, Robert Foley, 2020/02/19
- [PATCH v2 07/14] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/02/19
- [PATCH v2 08/14] tests/vm: Added configuration file support, Robert Foley, 2020/02/19
- [PATCH v2 09/14] tests/vm: add --boot-console switch, Robert Foley, 2020/02/19
- [PATCH v2 10/14] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/02/19
- [PATCH v2 11/14] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/02/19
- [PATCH v2 12/14] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/02/19
- [PATCH v2 13/14] tests/vm: Added a new script for centos.aarch64., Robert Foley, 2020/02/19