[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 06/12] tests/vm: allow wait_ssh() to specify command
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v8 06/12] tests/vm: allow wait_ssh() to specify command |
Date: |
Sun, 31 May 2020 13:25:26 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 |
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>
- [PATCH v8 00/12] tests/vm: Add support for aarch64 VMs, Robert Foley, 2020/05/29
- [PATCH v8 01/12] tests/vm: pass args through to BaseVM's __init__, Robert Foley, 2020/05/29
- [PATCH v8 02/12] tests/vm: Add configuration to basevm.py, Robert Foley, 2020/05/29
- [PATCH v8 03/12] tests/vm: Added configuration file support, Robert Foley, 2020/05/29
- [PATCH v8 04/12] tests/vm: Pass --debug through for vm-boot-ssh., Robert Foley, 2020/05/29
- [PATCH v8 05/12] tests/vm: Add ability to select QEMU from current build., Robert Foley, 2020/05/29
- [PATCH v8 06/12] tests/vm: allow wait_ssh() to specify command, Robert Foley, 2020/05/29
- Re: [PATCH v8 06/12] tests/vm: allow wait_ssh() to specify command,
Philippe Mathieu-Daudé <=
- [PATCH v8 07/12] tests/vm: Add common Ubuntu python module, Robert Foley, 2020/05/29
- [PATCH v8 08/12] tests/vm: Added a new script for ubuntu.aarch64., Robert Foley, 2020/05/29
- [PATCH v8 09/12] tests/vm: Added a new script for centos.aarch64., Robert Foley, 2020/05/29
- [PATCH v8 10/12] tests/vm: change scripts to use self._config, Robert Foley, 2020/05/29
- [PATCH v8 11/12] python/qemu: Add ConsoleSocket for optional use in QEMUMachine, Robert Foley, 2020/05/29
- [PATCH v8 12/12] tests/vm: Add workaround to consume console, Robert Foley, 2020/05/29