From: "Daniel P. Berrangé" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Ani Sinha" <anisinha@redhat.com>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>
Subject: [PATCH v2 07/18] tests/functional: remove comments talking about avocado
Date: Thu, 21 Nov 2024 15:42:07 +0000 [thread overview]
Message-ID: <20241121154218.1423005-8-berrange@redhat.com> (raw)
In-Reply-To: <20241121154218.1423005-1-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>
---
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 ...")
--
2.46.0
next prev parent reply other threads:[~2024-11-21 15:45 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-21 15:42 [PATCH v2 00/18] test/functional: improve functional test debugging & fix tuxrun Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 01/18] tests/functional: fix mips64el test to honour workdir Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 02/18] tests/functional: automatically clean up scratch files after tests Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 03/18] tests/functional: remove "AVOCADO" from env variable name Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 04/18] tests/functional: remove todo wrt avocado.utils.wait_for Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 05/18] tests/functional: remove leftover :avocado: tags Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 06/18] tests/functional: remove obsolete reference to avocado bug Daniel P. Berrangé
2024-11-21 15:42 ` Daniel P. Berrangé [this message]
2024-11-21 15:42 ` [PATCH v2 08/18] tests/functional: honour self.workdir in ACPI bits tests Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 09/18] tests/functional: put QEMUMachine logs in testcase log directory Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 10/18] tests/functional: honour requested test VM name in QEMUMachine Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 11/18] tests/functional: enable debug logging for QEMUMachine Daniel P. Berrangé
2024-11-21 19:01 ` Thomas Huth
2024-11-21 15:42 ` [PATCH v2 12/18] tests/functional: logs details of console interaction operations Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 13/18] tests/functional: don't try to wait for the empty string Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 14/18] tests/functional: require non-NULL success_message for console wait Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 15/18] tests/functional: rewrite console handling to be bytewise Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 16/18] tests/functional: remove time.sleep usage from tuxrun tests Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 17/18] tests/functional: add a QMP backdoor for debugging stalled tests Daniel P. Berrangé
2024-11-21 15:42 ` [PATCH v2 18/18] tests/functional: avoid accessing log_filename on earlier failures Daniel P. Berrangé
2024-11-21 16:41 ` [PATCH v2 00/18] test/functional: improve functional test debugging & fix tuxrun Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241121154218.1423005-8-berrange@redhat.com \
--to=berrange@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=anisinha@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).