[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/14] tests/vm: allow wait_ssh() to specify command
From: |
Robert Foley |
Subject: |
[PATCH v2 11/14] tests/vm: allow wait_ssh() to specify command |
Date: |
Wed, 19 Feb 2020 11:35:34 -0500 |
This allows for waiting for completion of arbitrary commands.
Signed-off-by: Robert Foley <address@hidden>
---
tests/vm/basevm.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index a30a641a4a..792e4a3fb2 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -407,24 +407,24 @@ class BaseVM(object):
def print_step(self, text):
sys.stderr.write("### %s ...\n" % text)
- def wait_ssh(self, wait_root=False, seconds=300):
+ def wait_ssh(self, wait_root=False, seconds=300, cmd="exit 0"):
# 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
+ cmd_success = False
while datetime.datetime.now() < endtime:
- if wait_root and self.ssh_root("exit 0") == 0:
- guest_up = True
+ if wait_root and self.ssh_root(cmd) == 0:
+ cmd_success = True
break
- elif self.ssh("exit 0") == 0:
- guest_up = True
+ elif self.ssh(cmd) == 0:
+ cmd_success = True
break
seconds = (endtime - datetime.datetime.now()).total_seconds()
logging.debug("%ds before timeout", seconds)
time.sleep(1)
- if not guest_up:
+ if not cmd_success:
raise Exception("Timeout while waiting for guest ssh")
def shutdown(self):
--
2.17.1
- [PATCH v2 01/14] tests/vm: use $(PYTHON) consistently, (continued)
- [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, 2020/02/19
- [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 <=
- [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
- [PATCH v2 14/14] tests/vm: change scripts to use self._config, Robert Foley, 2020/02/19