From 66a5b48a3a1d5849b98d52df4072db939f2734c7 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 2 Sep 2016 15:51:23 -0600 Subject: [PATCH] undo the changes to the hist_utils move tool and remove suffix in ssp test (no hist files produced) --- utils/python/CIME/SystemTests/ssp.py | 2 +- utils/python/CIME/SystemTests/system_tests_common.py | 6 +----- utils/python/CIME/hist_utils.py | 9 +++------ 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/utils/python/CIME/SystemTests/ssp.py b/utils/python/CIME/SystemTests/ssp.py index b4acf0a42cd5..0ce1fbe7bdec 100644 --- a/utils/python/CIME/SystemTests/ssp.py +++ b/utils/python/CIME/SystemTests/ssp.py @@ -56,7 +56,7 @@ def run_phase(self): clone.flush() dout_sr = clone.get_value("DOUT_S_ROOT") - self.run_indv(suffix="spinup", st_archive=True) + self.run_indv(suffix="", st_archive=True) #------------------------------------------------------------------- # (2) do a hybrid, non-spinup run in orig_case diff --git a/utils/python/CIME/SystemTests/system_tests_common.py b/utils/python/CIME/SystemTests/system_tests_common.py index 917c4b7cbb27..136c47b0c2e6 100644 --- a/utils/python/CIME/SystemTests/system_tests_common.py +++ b/utils/python/CIME/SystemTests/system_tests_common.py @@ -223,12 +223,8 @@ def _coupler_log_indicates_run_complete(self): return False def _component_compare_move(self, suffix): - success, comments = move(self._case, suffix) + comments = move(self._case, suffix) append_status(comments, sfile="TestStatus.log") - status = TEST_PASS_STATUS if success else TEST_FAIL_STATUS - with self._test_status: - self._test_status.set_status("%s_%s" % (COMPARE_PHASE, suffix), status) - return success def _component_compare_test(self, suffix1, suffix2): """ diff --git a/utils/python/CIME/hist_utils.py b/utils/python/CIME/hist_utils.py index a50b26bacf08..02adcd7455ac 100644 --- a/utils/python/CIME/hist_utils.py +++ b/utils/python/CIME/hist_utils.py @@ -75,12 +75,9 @@ def move(case, suffix): comments += " Copying '%s' to '%s'\n" % (test_hist, new_file) shutil.copy(test_hist, new_file) - all_success = True - if num_moved == 0: - all_success = False - comments += "WARNING: No hist files found in rundir '%s'" % rundir + expect(num_moved > 0, "move failed: no hist files found in rundir '%s'" % rundir) - return all_success, comments + return comments def _hists_match(model, hists1, hists2, suffix1="", suffix2=""): @@ -312,12 +309,12 @@ def get_extension(model, filepath): m = ext_regex.match(basename) expect(m is not None, "Failed to get extension for file '%s'" % filepath) + if m.group(1) is not None: result = m.group(1)+'.'+m.group(2) else: result = m.group(2) - return result def generate_baseline(case, baseline_dir=None, allow_baseline_overwrite=False):