diff mbox series

[v4,06/10] tests/vm: allow wait_ssh() to specify command

Message ID 20200312142728.12285-7-robert.foley@linaro.org
State Superseded
Headers show
Series tests/vm: Add support for aarch64 VMs | expand

Commit Message

Robert Foley March 12, 2020, 2:27 p.m. UTC 
This allows for waiting for completion of arbitrary commands.

Signed-off-by: Robert Foley <robert.foley@linaro.org>

---
 tests/vm/basevm.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

-- 
2.17.1

Comments

Alex Bennée May 11, 2020, 9:15 a.m. UTC | #1 
Robert Foley <robert.foley@linaro.org> writes:

> This allows for waiting for completion of arbitrary commands.

>

> Signed-off-by: Robert Foley <robert.foley@linaro.org>


Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

<snip>

-- 
Alex Bennée
diff mbox series

Patch

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 3562a33ffa..305b839000 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -394,24 +394,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):