Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

System tests compare two stage two #1738

Merged
merged 4 commits into from
Jul 14, 2017
Merged

System tests compare two stage two #1738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c66db8e
stage data for second run if required
jedwards4b Jul 13, 2017
0f338c2
fix unit test
jedwards4b Jul 13, 2017
5b460f5
remove debug print statement
jedwards4b Jul 13, 2017
12ba5fa
use case_submit check_case method instead
jedwards4b Jul 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions scripts/lib/CIME/SystemTests/system_tests_compare_two.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
from CIME.XML.standard_module_setup import *
from CIME.SystemTests.system_tests_common import SystemTestsCommon
from CIME.case import Case
from CIME.case_submit import check_case

import shutil, os, glob

Expand Down Expand Up @@ -164,11 +165,15 @@ def run_phase(self, success_change=False): # pylint: disable=arguments-differ
# First run
logger.info('Doing first run: ' + self._run_one_description)
self._activate_case1()
run_type = self._case1.get_value("RUN_TYPE")
self.run_indv(suffix = self._run_one_suffix)

# Second run
logger.info('Doing second run: ' + self._run_two_description)
self._activate_case2()
# we need to make sure run2 is properly staged.
if run_type != "startup":
check_case(self._case2, self._caseroot2)
self._force_case2_settings()
self.run_indv(suffix = self._run_two_suffix)

Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/CIME/tests/case_fake.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ def __init__(self, case_root, create_case_root=True):
casename = os.path.basename(case_root)
self.set_value('CASE', casename)
self.set_value('CASEBASEID', casename)
self.set_value('RUN_TYPE', 'startup')
self.set_rundir()

def get_value(self, item):
Expand Down Expand Up @@ -100,4 +101,3 @@ def set_rundir(self):
inside CASEROOT)
"""
self.set_value('RUNDIR', os.path.join(self.get_value('CASEROOT'), 'run'))