| Message ID | 20220816133831.2166761-1-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [RFC] tests/avocado: push default timeout to QemuBaseTest | expand |
On 8/16/22 08:38, 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. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/avocado/avocado_qemu/__init__.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > 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 Is 15 minutes really a reasonable default? r~ > distro = None > username = 'root' > password = 'password'
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'
All of the QEMU tests eventually end up derrived from this class. Move the default timeout from LinuxTest to ensure we catch them all. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/avocado/avocado_qemu/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)