From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Cleber Rosa" <crosa@redhat.com>, "Kevin Wolf" <kwolf@redhat.com>, kvm@vger.kernel.org, "Richard Henderson" <rth@twiddle.net>, "Fam Zheng" <fam@euphon.net>, "Eduardo Habkost" <ehabkost@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, "Paolo Bonzini" <pbonzini@redhat.com>, "Max Reitz" <mreitz@redhat.com>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Stefan Hajnoczi" <stefanha@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Marcelo Tosatti" <mtosatti@redhat.com>, qemu-block@nongnu.org, "Robert Foley" <robert.foley@linaro.org>, "Peter Puhov" <peter.puhov@linaro.org> Subject: [PULL 20/25] tests/vm: allow wait_ssh() to specify command Date: Sun, 31 May 2020 18:38:41 +0200 [thread overview] Message-ID: <20200531163846.25363-21-philmd@redhat.com> (raw) In-Reply-To: <20200531163846.25363-1-philmd@redhat.com> From: Robert Foley <robert.foley@linaro.org> 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200529203458.1038-7-robert.foley@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- 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 5a3ce42281..a80b616a08 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -320,24 +320,24 @@ def console_sshd_config(self, prompt): 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.21.3
WARNING: multiple messages have this Message-ID (diff)
From: "Philippe Mathieu-Daudé" <philmd@redhat.com> To: qemu-devel@nongnu.org Cc: "Kevin Wolf" <kwolf@redhat.com>, "Fam Zheng" <fam@euphon.net>, "Robert Foley" <robert.foley@linaro.org>, "Eduardo Habkost" <ehabkost@redhat.com>, kvm@vger.kernel.org, "Peter Puhov" <peter.puhov@linaro.org>, "Philippe Mathieu-Daudé" <philmd@redhat.com>, "Marcelo Tosatti" <mtosatti@redhat.com>, "Markus Armbruster" <armbru@redhat.com>, "Max Reitz" <mreitz@redhat.com>, "Stefan Hajnoczi" <stefanha@redhat.com>, "Cleber Rosa" <crosa@redhat.com>, "Paolo Bonzini" <pbonzini@redhat.com>, qemu-block@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>, "Richard Henderson" <rth@twiddle.net> Subject: [PULL 20/25] tests/vm: allow wait_ssh() to specify command Date: Sun, 31 May 2020 18:38:41 +0200 [thread overview] Message-ID: <20200531163846.25363-21-philmd@redhat.com> (raw) In-Reply-To: <20200531163846.25363-1-philmd@redhat.com> From: Robert Foley <robert.foley@linaro.org> 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> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20200529203458.1038-7-robert.foley@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- 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 5a3ce42281..a80b616a08 100644 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -320,24 +320,24 @@ def console_sshd_config(self, prompt): 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.21.3
next prev parent reply other threads:[~2020-05-31 16:40 UTC|newest] Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-31 16:38 [PULL 00/25] python-next patches for 2020-05-31 Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 01/25] scripts/qemugdb: Remove shebang header Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 02/25] scripts/qemu-gdb: Use Python 3 interpreter Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 03/25] scripts/qmp: " Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 04/25] scripts/kvm/vmxcap: Use Python 3 interpreter and add pseudo-main() Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 05/25] scripts/modules/module_block: Use Python 3 interpreter & add pseudo-main Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 06/25] scripts/qmp: Fix shebang and imports Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 07/25] python: remove more instances of sys.version_info Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 08/25] python/qemu/machine: add kill() method Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 09/25] python/qemu/machine: remove logging configuration Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 10/25] python/qemu: delint and add pylintrc Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 11/25] python/qemu: delint; add flake8 config Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 12/25] python/qemu: remove Python2 style super() calls Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 13/25] python/qemu: fix socket.makefile() typing Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 14/25] python/qemu: Adjust traceback typing Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 15/25] python/qemu/qmp: use True/False for non/blocking modes Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 16/25] python/qemu/qmp: assert sockfile is not None Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 17/25] python/qemu/qtest: Check before accessing _qtest Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 18/25] tests/vm: Pass --debug through for vm-boot-ssh Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 19/25] tests/vm: Add ability to select QEMU from current build Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé [this message] 2020-05-31 16:38 ` [PULL 20/25] tests/vm: allow wait_ssh() to specify command Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 21/25] tests/migration/guestperf: Use Python 3 interpreter Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 22/25] tests/acceptance/migration.py: Wait for both sides Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 23/25] tests/acceptance: allow console interaction with specific VMs Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 24/25] tests/acceptance: refactor boot_linux_console test to allow code reuse Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-05-31 16:38 ` [PULL 25/25] tests/acceptance: refactor boot_linux " Philippe Mathieu-Daudé 2020-05-31 16:38 ` Philippe Mathieu-Daudé 2020-06-01 12:03 ` [PULL 00/25] python-next patches for 2020-05-31 Peter Maydell 2020-06-01 12:03 ` Peter Maydell
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200531163846.25363-21-philmd@redhat.com \ --to=philmd@redhat.com \ --cc=alex.bennee@linaro.org \ --cc=armbru@redhat.com \ --cc=crosa@redhat.com \ --cc=ehabkost@redhat.com \ --cc=fam@euphon.net \ --cc=kvm@vger.kernel.org \ --cc=kwolf@redhat.com \ --cc=mreitz@redhat.com \ --cc=mtosatti@redhat.com \ --cc=pbonzini@redhat.com \ --cc=peter.puhov@linaro.org \ --cc=qemu-block@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=robert.foley@linaro.org \ --cc=rth@twiddle.net \ --cc=stefanha@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.