On 19/11/2024 16.05, Daniel P. Berrangé wrote:
> 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>
> ---
> tests/functional/test_acpi_bits.py | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/tests/functional/test_acpi_bits.py b/tests/functional/test_acpi_bits.py
> index ee40647d5b..6a7758c576 100755
> --- a/tests/functional/test_acpi_bits.py
> +++ b/tests/functional/test_acpi_bits.py
> @@ -196,11 +196,11 @@ 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 our
> + # test harness does not try to load them. These scripts are
Since our test framework does not try to scan for *.py files automatically
(but the files have to be added via meson.build instead), I'd maybe rather say:
"all test scripts are named with extension .py2 so that they are not run by
accident"
or something similar?
> + # written for python 2.7 not python 3 and hence if our test
> + # harness loaded them, it would complain about python 3
> + # specific syntaxes.
> 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 +399,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 ...")