[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 04/14] tests/vm: give wait_ssh() option to wait for root
From: |
Robert Foley |
Subject: |
[PATCH v1 04/14] tests/vm: give wait_ssh() option to wait for root |
Date: |
Wed, 5 Feb 2020 16:29:10 -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>
---
tests/vm/basevm.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 4de358ae22..a29099f6f1 100755
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -314,7 +314,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
@@ -322,7 +322,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()
@@ -333,7 +336,6 @@ class BaseVM(object):
def shutdown(self):
self._guest.shutdown()
-
def wait(self):
self._guest.wait()
--
2.17.1
- [PATCH v1 00/14] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/02/05
- [PATCH v1 01/14] tests/vm: use $(PYTHON) consistently, Robert Foley, 2020/02/05
- [PATCH v1 02/14] tests/vm: Debug mode shows ssh output., Robert Foley, 2020/02/05
- [PATCH v1 03/14] tests/vm: increased max timeout for vm boot., Robert Foley, 2020/02/05
- [PATCH v1 04/14] tests/vm: give wait_ssh() option to wait for root,
Robert Foley <=
- [PATCH v1 05/14] tests/vm: Added gen_cloud_init_iso() to basevm.py, Robert Foley, 2020/02/05
- [PATCH v1 06/14] tests/vm: Add logging of console to file., Robert Foley, 2020/02/05
- [PATCH v1 07/14] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/02/05
- [PATCH v1 08/14] tests/vm: Added configuration file support, Robert Foley, 2020/02/05