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>
This commit is contained in:
Alex Bennée 2022-08-22 17:56:03 +01:00
parent a8cc5842b5
commit 48acf68cfe

View File

@ -227,6 +227,10 @@ def exec_command_and_wait_for_pattern(test, command,
_console_interaction(test, success_message, failure_message, command + '\r') _console_interaction(test, success_message, failure_message, command + '\r')
class QemuBaseTest(avocado.Test): class QemuBaseTest(avocado.Test):
# default timeout for all tests, can be overridden
timeout = 900
def _get_unique_tag_val(self, tag_name): def _get_unique_tag_val(self, tag_name):
""" """
Gets a tag value, if unique for a key 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. to start with than the more vanilla `QemuSystemTest` class.
""" """
timeout = 900
distro = None distro = None
username = 'root' username = 'root'
password = 'password' password = 'password'