From 500c0df9c69022fdc692a33a2ba70b1a7239b84a Mon Sep 17 00:00:00 2001 From: Jason Boutte Date: Mon, 13 Nov 2023 12:50:48 -0800 Subject: [PATCH 1/2] Fixes separating std and performance blessing --- CIME/bless_test_results.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CIME/bless_test_results.py b/CIME/bless_test_results.py index c6f0754ebd8..0502c541d3a 100644 --- a/CIME/bless_test_results.py +++ b/CIME/bless_test_results.py @@ -216,7 +216,7 @@ def bless_test_results( bless_perf=False, **_, # Capture all for extra ): - bless_all = not (namelists_only | hist_only) + bless_all = not (namelists_only | hist_only | bless_tput | bless_mem | bless_perf) test_status_files = get_test_status_files(test_root, compiler, test_id=test_id) From 126b568b4842735cd8c2a8241cb1b43659ce173b Mon Sep 17 00:00:00 2001 From: Jason Boutte Date: Mon, 13 Nov 2023 15:30:35 -0800 Subject: [PATCH 2/2] Fixes tests --- CIME/tests/test_unit_bless_test_results.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CIME/tests/test_unit_bless_test_results.py b/CIME/tests/test_unit_bless_test_results.py index fe9003d1bd2..620f07f9603 100644 --- a/CIME/tests/test_unit_bless_test_results.py +++ b/CIME/tests/test_unit_bless_test_results.py @@ -429,7 +429,7 @@ def test_bless_perf( ts = TestStatus.return_value ts.get_name.return_value = "SMS.f19_g16.S.docker_gnu" ts.get_overall_test_status.return_value = ("PASS", "RUN") - ts.get_status.side_effect = ["PASS", "PASS", "PASS", "FAIL", "FAIL"] + ts.get_status.side_effect = ["PASS", "PASS", "FAIL", "FAIL", "FAIL"] case = Case.return_value.__enter__.return_value @@ -470,7 +470,7 @@ def test_bless_memory_only( ts = TestStatus.return_value ts.get_name.return_value = "SMS.f19_g16.S.docker_gnu" ts.get_overall_test_status.return_value = ("PASS", "RUN") - ts.get_status.side_effect = ["PASS", "PASS", "PASS", "FAIL"] + ts.get_status.side_effect = ["PASS", "PASS", "FAIL", "FAIL"] case = Case.return_value.__enter__.return_value @@ -509,7 +509,7 @@ def test_bless_throughput_only( ts = TestStatus.return_value ts.get_name.return_value = "SMS.f19_g16.S.docker_gnu" ts.get_overall_test_status.return_value = ("PASS", "RUN") - ts.get_status.side_effect = ["PASS", "PASS", "PASS", "FAIL"] + ts.get_status.side_effect = ["PASS", "PASS", "FAIL", "FAIL"] case = Case.return_value.__enter__.return_value