| Message ID | 20241121165806.476008-8-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | maintainer updates for -rc2 pre-PR | expand |
On 11/21/24 08:57, Alex Bennée wrote: > From: Daniel P. Berrangé <berrange@redhat.com> > > The first comment is still relevant but should talk about our own test > harness instead. The second comment adds no value over reading the code > and can be removed. > > Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> > Message-Id: <20241121154218.1423005-8-berrange@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/functional/test_acpi_bits.py | 13 ++++++------- > 1 file changed, 6 insertions(+), 7 deletions(-) > > diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/test_acpi_bits.py > index ee40647d5b..4c192d95cc 100755 > --- a/tests/functional/test_acpi_bits.py > +++ b/tests/functional/test_acpi_bits.py > @@ -196,11 +196,12 @@ def copy_test_scripts(self): > for filename in os.listdir(bits_test_dir): > if os.path.isfile(os.path.join(bits_test_dir, filename)) and \ > filename.endswith('.py2'): > - # all test scripts are named with extension .py2 so that > - # avocado does not try to load them. These scripts are > - # written for python 2.7 not python 3 and hence if avocado > - # loaded them, it would complain about python 3 specific > - # syntaxes. > + # All test scripts are named with extension .py2 so that > + # they are not run by accident. > + # > + # These scripts are intended to run inside the test VM > + # and are written for python 2.7 not python 3, hence > + # would cause syntax errors if loaded ouside the VM. > newfilename = os.path.splitext(filename)[0] + '.py' > shutil.copy2(os.path.join(bits_test_dir, filename), > os.path.join(target_test_dir, newfilename)) > @@ -399,8 +400,6 @@ 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. > - # 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.logger.debug("Checking console output ...") Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/test_acpi_bits.py index ee40647d5b..4c192d95cc 100755 --- a/tests/functional/test_acpi_bits.py +++ b/tests/functional/test_acpi_bits.py @@ -196,11 +196,12 @@ def copy_test_scripts(self): for filename in os.listdir(bits_test_dir): if os.path.isfile(os.path.join(bits_test_dir, filename)) and \ filename.endswith('.py2'): - # all test scripts are named with extension .py2 so that - # avocado does not try to load them. These scripts are - # written for python 2.7 not python 3 and hence if avocado - # loaded them, it would complain about python 3 specific - # syntaxes. + # All test scripts are named with extension .py2 so that + # they are not run by accident. + # + # These scripts are intended to run inside the test VM + # and are written for python 2.7 not python 3, hence + # would cause syntax errors if loaded ouside the VM. newfilename = os.path.splitext(filename)[0] + '.py' shutil.copy2(os.path.join(bits_test_dir, filename), os.path.join(target_test_dir, newfilename)) @@ -399,8 +400,6 @@ 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. - # 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.logger.debug("Checking console output ...")