From 7a493a02c498faccdaf6408aa236945e11fe7e4b Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Mon, 1 Aug 2016 15:57:16 -0600 Subject: [PATCH] remove multiple run lines from test file --- .../CIME/SystemTests/system_tests_common.py | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/utils/python/CIME/SystemTests/system_tests_common.py b/utils/python/CIME/SystemTests/system_tests_common.py index e3b0fb73014a..609254cd216b 100644 --- a/utils/python/CIME/SystemTests/system_tests_common.py +++ b/utils/python/CIME/SystemTests/system_tests_common.py @@ -49,10 +49,15 @@ def __init__(self, case, expected=None): self._case.set_value("TEST",True) self._case.flush() + def fail_test(self): + self._runstatus = "FAIL" def has_failed(self): return self._runstatus == "FAIL" + def pass_test(self): + if not self.has_failed(): + self._runstatus = "PASS" def has_passed(self): return self._runstatus == "PASS" @@ -85,7 +90,7 @@ def _set_active_case(self, case): def _run(self, suffix="base", coupler_log_path=None, st_archive=False): if self._case.get_value("IS_FIRST_RUN"): self._runstatus = "PEND" - self.update_test_status(self._runstatus,"RUN with suffix %s"%suffix) + self.update_test_status(self._runstatus,"RUN") stop_n = self._case.get_value("STOP_N") stop_option = self._case.get_value("STOP_OPTION") @@ -106,12 +111,9 @@ def _run(self, suffix="base", coupler_log_path=None, st_archive=False): if success and self._coupler_log_indicates_run_complete(coupler_log_path): self._runstatus = "PASS" - self.update_test_status("PASS","RUN with suffix %s"%suffix) else: success = False self._runstatus = "FAIL" - self.update_test_status("FAIL","RUN with suffix %s"%suffix) - if success and suffix is not None: self._component_compare_move(suffix) except: @@ -119,7 +121,6 @@ def _run(self, suffix="base", coupler_log_path=None, st_archive=False): # being marked FAIL success = False self._runstatus = "FAIL" - self.update_test_status("FAIL","RUN with suffix %s"%suffix) logger.warning("Exception during run: %s" % (sys.exc_info()[1])) return success @@ -144,10 +145,10 @@ def update_test_status(self, status, phase): else: f.write(line+"\n") if not found: - f.write("%s %s %d\n"%(status, string, total_time)) + f.write("%s %s %d\n"%(status, string, total_time)) # This prevents the __del__ method from overwritting an up to date status if phase.startswith("RUN"): - self._runstatus = None + self._runstatus = None def _coupler_log_indicates_run_complete(self, coupler_log_path): @@ -401,7 +402,9 @@ def build(self, sharedlib_only=False, model_only=False): self._case.flush() def run(self): - return SystemTestsCommon._run(self, suffix=None) + success = SystemTestsCommon._run(self, suffix=None) + if success and self._runstatus is None: + self._runstatus = "PASS" class TESTRUNPASS(FakeTest): @@ -417,7 +420,9 @@ def build(self, sharedlib_only=False, model_only=False): sharedlib_only=sharedlib_only, model_only=model_only) class TESTRUNDIFF(FakeTest): - + ''' + This test is intended to be run from scripts_regression_tests.py only + ''' def build(self, sharedlib_only=False, model_only=False): rundir = self._case.get_value("RUNDIR") cimeroot = self._case.get_value("CIMEROOT")