67 lines
2.7 KiB
Diff
67 lines
2.7 KiB
Diff
|
From 1f6dde2350209e937a5676c6775d1500136caea2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
Date: Mon, 18 Nov 2024 13:48:37 +0800
|
||
|
|
Subject: [PATCH] acpi/tests/avocado/bits: wait for 200 seconds for SHUTDOWN
|
||
|
|
event from bits VM
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
cheery-pick from 7ef4c41e91d59d72a3b8bc022a6cb3e81787a50a
|
||
|
|
|
||
|
|
By default, the timeout to receive any specified event from the QEMU VM is 60
|
||
|
|
seconds set by the python avocado test framework. Please see event_wait() and
|
||
|
|
events_wait() in python/qemu/machine/machine.py. If the matching event is not
|
||
|
|
triggered within that interval, an asyncio.TimeoutError is generated. Since the
|
||
|
|
timeout for the bits avocado test is 200 secs, we need to make event_wait()
|
||
|
|
timeout of the same value as well so that an early timeout is not triggered by
|
||
|
|
the avocado framework.
|
||
|
|
|
||
|
|
CC: peter.maydell@linaro.org
|
||
|
|
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2077
|
||
|
|
Signed-off-by: Ani Sinha <anisinha@redhat.com>
|
||
|
|
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
|
||
|
|
Message-id: 20240117042556.3360190-1-anisinha@redhat.com
|
||
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||
|
|
Signed-off-by: gubin <gubin_yewu@cmss.chinamobile.com>
|
||
|
|
---
|
||
|
|
tests/avocado/acpi-bits.py | 9 ++++++---
|
||
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/tests/avocado/acpi-bits.py b/tests/avocado/acpi-bits.py
|
||
|
|
index 68b9e98d4e..efe4f52ee0 100644
|
||
|
|
--- a/tests/avocado/acpi-bits.py
|
||
|
|
+++ b/tests/avocado/acpi-bits.py
|
||
|
|
@@ -54,6 +54,8 @@
|
||
|
|
deps = ["xorriso", "mformat"] # dependent tools needed in the test setup/box.
|
||
|
|
supported_platforms = ['x86_64'] # supported test platforms.
|
||
|
|
|
||
|
|
+# default timeout of 120 secs is sometimes not enough for bits test.
|
||
|
|
+BITS_TIMEOUT = 200
|
||
|
|
|
||
|
|
def which(tool):
|
||
|
|
""" looks up the full path for @tool, returns None if not found
|
||
|
|
@@ -133,7 +135,7 @@ class AcpiBitsTest(QemuBaseTest): #pylint: disable=too-many-instance-attributes
|
||
|
|
|
||
|
|
"""
|
||
|
|
# in slower systems the test can take as long as 3 minutes to complete.
|
||
|
|
- timeout = 200
|
||
|
|
+ timeout = BITS_TIMEOUT
|
||
|
|
|
||
|
|
def __init__(self, *args, **kwargs):
|
||
|
|
super().__init__(*args, **kwargs)
|
||
|
|
@@ -400,7 +402,8 @@ def test_acpi_smbios_bits(self):
|
||
|
|
|
||
|
|
# biosbits has been configured to run all the specified test suites
|
||
|
|
# in batch mode and then automatically initiate a vm shutdown.
|
||
|
|
- # Rely on avocado's unit test timeout.
|
||
|
|
- self._vm.event_wait('SHUTDOWN')
|
||
|
|
+ # Set timeout to BITS_TIMEOUT for SHUTDOWN event from bits VM at par
|
||
|
|
+ # with the avocado test timeout.
|
||
|
|
+ self._vm.event_wait('SHUTDOWN', timeout=BITS_TIMEOUT)
|
||
|
|
self._vm.wait(timeout=None)
|
||
|
|
self.parse_log()
|
||
|
|
--
|
||
|
|
2.41.0.windows.1
|
||
|
|
|