diff options
| author | John Snow | 2022-11-15 22:27:59 +0100 |
|---|---|---|
| committer | Michael S. Tsirkin | 2022-11-22 11:19:00 +0100 |
| commit | c4d4c40c516a52419be8ed2e1e7a7c1fd0dea3ee (patch) | |
| tree | 5646824cae97f98cc4a453d695477c02e09e67f1 | |
| parent | MAINTAINERS: add mst to list of biosbits maintainers (diff) | |
| download | qemu-c4d4c40c516a52419be8ed2e1e7a7c1fd0dea3ee.tar.gz qemu-c4d4c40c516a52419be8ed2e1e7a7c1fd0dea3ee.tar.xz qemu-c4d4c40c516a52419be8ed2e1e7a7c1fd0dea3ee.zip | |
tests/avocado: configure acpi-bits to use avocado timeout
Instead of using a hardcoded timeout, just rely on Avocado's built-in
test case timeout. This helps avoid timeout issues on machines where 60
seconds is not sufficient.
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20221115212759.3095751-1-jsnow@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Ani Sinha <ani@anisinha.ca>
| -rw-r--r-- | tests/avocado/acpi-bits.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py index 8745a58a76..ac13e22dc9 100644 --- a/tests/avocado/acpi-bits.py +++ b/tests/avocado/acpi-bits.py @@ -385,12 +385,6 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes self._vm.launch() # biosbits has been configured to run all the specified test suites # in batch mode and then automatically initiate a vm shutdown. - # sleep for maximum of one minute - max_sleep_time = time.monotonic() + 60 - while self._vm.is_running() and time.monotonic() < max_sleep_time: - time.sleep(1) - - self.assertFalse(time.monotonic() > max_sleep_time, - 'The VM seems to have failed to shutdown in time') - + # Rely on avocado's unit test timeout. + self._vm.wait(timeout=None) self.parse_log() |