From ab5309164b2a81b63502dcd0fad1b691bc44a551 Mon Sep 17 00:00:00 2001 From: Michal Nowak Date: Thu, 5 Dec 2024 12:54:38 +0100 Subject: [PATCH] Add rr-related common test artifacts (cherry picked from commit c607237b77f6cb56b51195f37685b83c73487fb6) --- bin/tests/system/conftest.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/bin/tests/system/conftest.py b/bin/tests/system/conftest.py index 37a26bb549..06cae48cad 100644 --- a/bin/tests/system/conftest.py +++ b/bin/tests/system/conftest.py @@ -358,14 +358,21 @@ def logger(request, system_test_name): def expected_artifacts(request): common_artifacts = [ ".libs/*", # possible build artifacts, see GL #5055 + "ns*/named.conf", "ns*/named.lock", + "ns*/named.memstats", "ns*/named.run", "ns*/named.run.prev", - "ns*/named.conf", - "ns*/named.memstats", "pytest.log.txt", ] + if "USE_RR" in os.environ: + common_artifacts += [ + "ns*/cpu_lock", + "ns*/latest-trace", + "ns*/named-[0-9]*", + ] + try: test_specific_artifacts = request.node.get_closest_marker("extra_artifacts") except AttributeError: