From: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Thomas Huth" <thuth@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Gustavo Romero" <gustavo.romero@linaro.org>,
"Pierrick Bouvier" <pierrick.bouvier@linaro.org>,
"Alex Bennée" <alex.bennee@linaro.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Manos Pitsidianakis" <manos.pitsidianakis@linaro.org>
Subject: [PATCH v3 2/4] tests/functional: add --keep-scratch CLI arg
Date: Fri, 25 Jul 2025 12:41:23 +0300 [thread overview]
Message-ID: <20250725-functional_tests_debug_arg-v3-2-b89921baf810@linaro.org> (raw)
In-Reply-To: <20250725-functional_tests_debug_arg-v3-0-b89921baf810@linaro.org>
Add CLI arg to keep scratch files after test execution, equivalent to
setting QEMU_TEST_KEEP_SCRATCH env var.
Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Manos Pitsidianakis <manos.pitsidianakis@linaro.org>
---
tests/functional/qemu_test/testcase.py | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tests/functional/qemu_test/testcase.py b/tests/functional/qemu_test/testcase.py
index eedca7f1ad29c9e654cf56535acf9639d679f5c4..f7e306cf749e8b24a712b09dfe8673660cbb5085 100644
--- a/tests/functional/qemu_test/testcase.py
+++ b/tests/functional/qemu_test/testcase.py
@@ -35,6 +35,7 @@
class QemuBaseTest(unittest.TestCase):
debug: bool = False
+ keep_scratch: bool = "QEMU_TEST_KEEP_SCRATCH" in os.environ
"""
Class method that initializes class attributes from given command-line
@@ -53,8 +54,16 @@ def parse_args():
help="Also print test and console logs on stdout. This will make "
"the TAP output invalid and is meant for debugging only.",
)
+ parser.add_argument(
+ "--keep-scratch",
+ action="store_true",
+ help="Do not purge any scratch files created during the tests. "
+ "This is equivalent to setting QEMU_TEST_KEEP_SCRATCH=1 in the "
+ "environment.",
+ )
args = parser.parse_args()
QemuBaseTest.debug = args.debug
+ QemuBaseTest.keep_scratch |= args.keep_scratch
return
'''
@@ -262,8 +271,10 @@ def setUp(self):
self.skipTest('One or more assets is not available')
def tearDown(self):
- if "QEMU_TEST_KEEP_SCRATCH" not in os.environ:
+ if not QemuBaseTest.keep_scratch:
shutil.rmtree(self.workdir)
+ else:
+ self.log.info(f"Kept scratch files in {self.workdir}")
if self.socketdir is not None:
shutil.rmtree(self.socketdir.name)
self.socketdir = None
--
2.47.2
next prev parent reply other threads:[~2025-07-25 9:43 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-25 9:41 [PATCH v3 0/4] tests/functional: add CLI args Manos Pitsidianakis
2025-07-25 9:41 ` [PATCH v3 1/4] tests/functional: add --debug CLI arg Manos Pitsidianakis
2025-07-25 12:44 ` Alex Bennée
2025-07-25 9:41 ` Manos Pitsidianakis [this message]
2025-07-25 9:41 ` [PATCH v3 3/4] tests/functional: add --list-tests " Manos Pitsidianakis
2025-07-25 9:41 ` [PATCH v3 4/4] tests/functional: add -k TEST_NAME_PATTERN " Manos Pitsidianakis
2025-07-25 12:44 ` Alex Bennée
2025-07-25 13:25 ` Daniel P. Berrangé
2025-07-25 14:48 ` Daniel P. Berrangé
2025-07-26 6:54 ` Thomas Huth
2025-07-28 8:32 ` Daniel P. Berrangé
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=20250725-functional_tests_debug_arg-v3-2-b89921baf810@linaro.org \
--to=manos.pitsidianakis@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=berrange@redhat.com \
--cc=gustavo.romero@linaro.org \
--cc=pbonzini@redhat.com \
--cc=philmd@linaro.org \
--cc=pierrick.bouvier@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).