[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 04/14] tests/vm: give wait_ssh() option to wait for root
From: |
Robert Foley |
Subject: |
[PATCH v2 04/14] tests/vm: give wait_ssh() option to wait for root |
Date: |
Wed, 19 Feb 2020 11:35:27 -0500 |
Allow wait_ssh to wait for root user to be ready.
This solves the issue where we perform a wait_ssh()
successfully, but the root user is not yet ready
to be logged in.
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, 5 insertions(+), 2 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 5ca445e29a..7f26892268 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -312,7 +312,7 @@ class BaseVM(object):
def print_step(self, text):
sys.stderr.write("### %s ...\n" % text)
- def wait_ssh(self, seconds=300):
+ def wait_ssh(self, wait_root=False, seconds=300):
# Allow more time for VM to boot under TCG.
if not kvm_available(self.arch):
seconds *= self.tcg_ssh_timeout_multiplier
@@ -320,7 +320,10 @@ class BaseVM(object):
endtime = starttime + datetime.timedelta(seconds=seconds)
guest_up = False
while datetime.datetime.now() < endtime:
- if self.ssh("exit 0") == 0:
+ if wait_root and self.ssh_root("exit 0") == 0:
+ guest_up = True
+ break
+ elif self.ssh("exit 0") == 0:
guest_up = True
break
seconds = (endtime - datetime.datetime.now()).total_seconds()
--
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, 2020/02/19
- [PATCH v2 04/14] tests/vm: give wait_ssh() option to wait for root,
Robert Foley <=
- [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
- [PATCH v2 14/14] tests/vm: change scripts to use self._config, Robert Foley, 2020/02/19