This allows for waiting for completion of arbitrary commands.

Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/vm/basevm.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index 75a7ac2bd3..1aab9e3a24 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -411,24 +411,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):
-- 
2.17.1

On 5/29/20 10:34 PM, Robert Foley wrote:
> This allows for waiting for completion of arbitrary commands.
> 
> Signed-off-by: Robert Foley <robert.foley@linaro.org>
> Reviewed-by: Peter Puhov <peter.puhov@linaro.org>
> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>  tests/vm/basevm.py | 14 +++++++-------
>  1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
> index 75a7ac2bd3..1aab9e3a24 100644
> --- a/tests/vm/basevm.py
> +++ b/tests/vm/basevm.py
> @@ -411,24 +411,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):
> 

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>