diff options
| author | Robert Foley <robert.foley@linaro.org> | 2020-03-03 15:06:17 +0000 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2020-03-04 09:57:27 +0000 |
| commit | fbb3aa29e20e20390e9aed4f4101a20d1e957b23 (patch) | |
| tree | 43fd2dbc753ddb3c365261cee56d234e894d0924 /tests/vm | |
| parent | c9de39355a54dfc7aaebddace364f14159e5607e (diff) | |
| download | qemu-fbb3aa29e20e20390e9aed4f4101a20d1e957b23.zip qemu-fbb3aa29e20e20390e9aed4f4101a20d1e957b23.tar.gz qemu-fbb3aa29e20e20390e9aed4f4101a20d1e957b23.tar.bz2 | |
tests/vm: give wait_ssh() option to wait for root
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 <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200219163537.22098-5-robert.foley@linaro.org>
Message-Id: <20200303150622.20133-5-alex.bennee@linaro.org>
Diffstat (limited to 'tests/vm')
| -rw-r--r-- | tests/vm/basevm.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 5ca445e..7f26892 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() |