From f97103a743c9ffd17fe836b1905670ed32ceb53f Mon Sep 17 00:00:00 2001 From: Eirini Koutsaniti Date: Tue, 15 Mar 2022 13:01:35 +0100 Subject: [PATCH 1/2] Fix rerun name when compact_test_names is True --- reframe/frontend/statistics.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/reframe/frontend/statistics.py b/reframe/frontend/statistics.py index af889b8b40..240d7de318 100644 --- a/reframe/frontend/statistics.py +++ b/reframe/frontend/statistics.py @@ -235,7 +235,14 @@ def print_failure_report(self, printer): f"{r['dependencies_actual']}") printer.info(f" * Maintainers: {r['maintainers']}") printer.info(f" * Failing phase: {r['fail_phase']}") - printer.info(f" * Rerun with '-n {r['unique_name']}" + if rt.runtime().get_option('general/0/compact_test_names'): + class_name = r['display_name'].split(' ')[0] + id = r['unique_name'].replace(class_name, '').replace('_', '@') + rerun_name = class_name + id + else: + rerun_name = r['unique_name'] + + printer.info(f" * Rerun with '-n {rerun_name}" f" -p {r['environment']} --system {r['system']} -r'") printer.info(f" * Reason: {r['fail_reason']}") From 8ea201a3471545c2ea959b4ded6b0d37551b46f2 Mon Sep 17 00:00:00 2001 From: Vasileios Karakasis Date: Tue, 15 Mar 2022 18:44:05 +0100 Subject: [PATCH 2/2] Style fixes --- reframe/frontend/statistics.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/reframe/frontend/statistics.py b/reframe/frontend/statistics.py index 240d7de318..62ca133646 100644 --- a/reframe/frontend/statistics.py +++ b/reframe/frontend/statistics.py @@ -236,13 +236,13 @@ def print_failure_report(self, printer): printer.info(f" * Maintainers: {r['maintainers']}") printer.info(f" * Failing phase: {r['fail_phase']}") if rt.runtime().get_option('general/0/compact_test_names'): - class_name = r['display_name'].split(' ')[0] - id = r['unique_name'].replace(class_name, '').replace('_', '@') - rerun_name = class_name + id + cls = r['display_name'].split(' ')[0] + variant = r['unique_name'].replace(cls, '').replace('_', '@') + nameoptarg = cls + variant else: - rerun_name = r['unique_name'] + nameoptarg = r['unique_name'] - printer.info(f" * Rerun with '-n {rerun_name}" + printer.info(f" * Rerun with '-n {nameoptarg}" f" -p {r['environment']} --system {r['system']} -r'") printer.info(f" * Reason: {r['fail_reason']}")