aboutsummaryrefslogtreecommitdiff
path: root/tests/avocado
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2022-08-22 17:56:03 +0100
committerAlex Bennée <alex.bennee@linaro.org>2022-08-24 10:14:42 +0100
commit48acf68cfe08496284fb12bf598721dea82d74a9 (patch)
treeee02890f0853bcd8885201d762c1a7e76daa4cb3 /tests/avocado
parenta8cc5842b5cb863e46a2d009151c6ccbdecadaba (diff)
tests/avocado: push default timeout to QemuBaseTest
All of the QEMU tests eventually end up derrived from this class. Move the default timeout from LinuxTest to ensure we catch them all. We keep the 15 minute timeout as currently some of the more heavyweight CFI and TCG tests can overrun. We should aim to drop it down to 2 minutes which is a more reasonable target for tests to aim for but we want to get this release out. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> [AJB: revert to 15 min timeout for v2] Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20220822165608.2980552-2-alex.bennee@linaro.org>
Diffstat (limited to 'tests/avocado')
-rw-r--r--tests/avocado/avocado_qemu/__init__.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py
index ed4853c805..9d17a287cf 100644
--- a/tests/avocado/avocado_qemu/__init__.py
+++ b/tests/avocado/avocado_qemu/__init__.py
@@ -227,6 +227,10 @@ def exec_command_and_wait_for_pattern(test, command,
_console_interaction(test, success_message, failure_message, command + '\r')
class QemuBaseTest(avocado.Test):
+
+ # default timeout for all tests, can be overridden
+ timeout = 900
+
def _get_unique_tag_val(self, tag_name):
"""
Gets a tag value, if unique for a key
@@ -512,7 +516,6 @@ class LinuxTest(LinuxSSHMixIn, QemuSystemTest):
to start with than the more vanilla `QemuSystemTest` class.
"""
- timeout = 900
distro = None
username = 'root'
password = 'password'