Message ID | 20220822165608.2980552-2-alex.bennee@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | testing fixes and doc tweak pre-PR | expand |
On 8/22/22 09:56, Alex Bennée wrote: > All of the QEMU tests eventually end up derrived from this class. Move > the default timeout from LinuxTest to ensure we catch them all. As 15 > minutes is fairly excessive we drop the default down to 2 minutes > which is a more reasonable target for tests to aim for. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20220816133831.2166761-1-alex.bennee@linaro.org> > > --- > v2 > - lower timeout to 2 minutes/120 seconds Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 22/8/22 18:56, Alex Bennée wrote: > All of the QEMU tests eventually end up derrived from this class. Move Typo "derived". > the default timeout from LinuxTest to ensure we catch them all. As 15 > minutes is fairly excessive we drop the default down to 2 minutes > which is a more reasonable target for tests to aim for. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > Message-Id: <20220816133831.2166761-1-alex.bennee@linaro.org> > > --- > v2 > - lower timeout to 2 minutes/120 seconds > --- > tests/avocado/avocado_qemu/__init__.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/avocado/avocado_qemu/__init__.py b/tests/avocado/avocado_qemu/__init__.py index ed4853c805..0efd2bd212 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 = 120 + 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'
All of the QEMU tests eventually end up derrived from this class. Move the default timeout from LinuxTest to ensure we catch them all. As 15 minutes is fairly excessive we drop the default down to 2 minutes which is a more reasonable target for tests to aim for. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Message-Id: <20220816133831.2166761-1-alex.bennee@linaro.org> --- v2 - lower timeout to 2 minutes/120 seconds --- tests/avocado/avocado_qemu/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)