[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 4/9] tests/vm: give wait_ssh() option to wait for root
From: |
Alex Bennée |
Subject: |
[PATCH v2 4/9] tests/vm: give wait_ssh() option to wait for root |
Date: |
Tue, 3 Mar 2020 15:06:17 +0000 |
From: Robert Foley <address@hidden>
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>
Signed-off-by: Alex Bennée <address@hidden>
Message-Id: <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 5ca445e29af..7f268922685 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.20.1
- [PATCH v2 0/9] testing/next (buildvm and re-greening tweeks), Alex Bennée, 2020/03/03
- [PATCH v2 1/9] tests/vm: use $(PYTHON) consistently, Alex Bennée, 2020/03/03
- [PATCH v2 2/9] tests/vm: Debug mode shows ssh output., Alex Bennée, 2020/03/03
- [PATCH v2 6/9] travis: enable tools build on OS X, Alex Bennée, 2020/03/03
- [PATCH v2 4/9] tests/vm: give wait_ssh() option to wait for root,
Alex Bennée <=
- [PATCH v2 7/9] configure: detect and report genisoimage, Alex Bennée, 2020/03/03
- [PATCH v2 3/9] tests/vm: increased max timeout for vm boot., Alex Bennée, 2020/03/03
- [PATCH v2 5/9] tests/vm: Added gen_cloud_init_iso() to basevm.py, Alex Bennée, 2020/03/03
- [PATCH v2 8/9] tests/acceptance: bump avocado requirements to 76.0, Alex Bennée, 2020/03/03
- [PATCH v2 9/9] travis.yml: install python3 numpy and opencv libraries, Alex Bennée, 2020/03/03