Merge branch 'jedwards4b-read_xml_fix'

E3SM-Project · Jul 14, 2016 · 8fa604a · 8fa604a
2 parents c10289e + 41c71bf
commit 8fa604a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/utils/python/CIME/SystemTests/system_tests_common.py b/utils/python/CIME/SystemTests/system_tests_common.py
@@ -46,6 +46,7 @@ def __init__(self, case, expected=None):
 
         case_setup(self._case, reset=True, test_mode=True)
         self._case.set_value("TEST",True)
+        self._case.flush()
 
     def build(self, sharedlib_only=False, model_only=False):
         build.case_build(self._caseroot, case=self._case,

diff --git a/utils/python/CIME/case.py b/utils/python/CIME/case.py
@@ -110,8 +110,12 @@ def schedule_rewrite(self, env_file):
         self._env_files_that_need_rewrite.add(env_file)
 
     def read_xml(self, case_root):
-        expect(len(self._env_files_that_need_rewrite)==0,
-               "Case object has modifications that would be overwritten by read_xml")
+        if(len(self._env_files_that_need_rewrite)>0):
+            files = ""
+            for env_file in self._env_files_that_need_rewrite:
+                files += " "+env_file.filename
+            expect(False,"Object(s) %s seem to have newer data than the corresponding case file"%files)
+
         self._env_entryid_files = []
         self._env_entryid_files.append(EnvRun(case_root))
         self._env_entryid_files.append(EnvBuild(case_root))
@@ -191,9 +195,9 @@ def get_values(self, item=None, attribute=None, resolved=True, subgroup=None):
         """
         Return info object for given item, return all info for all item if item is empty.
         """
-        
+
         logger.debug("(get_values) Input values: %s , %s , %s , %s , %s" , self.__class__.__name__ , item, attribute, resolved, subgroup)
-        
+
         # Empty result list
         results = []
 
@@ -225,11 +229,11 @@ def get_values(self, item=None, attribute=None, resolved=True, subgroup=None):
                     for r in result :
                         if r['group'] == subgroup :
                             found.append(r)
-                    results += found        
-                else:                 
+                    results += found
+                else:
                     results = results + result
-                    
-        logger.debug("(get_values) Return value:  %s" , results )            
+
+        logger.debug("(get_values) Return value:  %s" , results )
         return results
 
 
@@ -275,8 +279,8 @@ def set_value(self, item, value, subgroup=None, ignore_type=False):
         for env_file in self._env_entryid_files:
             result = env_file.set_value(item, value, subgroup, ignore_type)
             if (result is not None):
-                logger.debug("Will rewrite file %s",env_file.filename)
-                self.schedule_rewrite(env_file)
+                logger.debug("Will rewrite file %s %s",env_file.filename, item)
+                self._env_files_that_need_rewrite.add(env_file)
                 return result
         if result is None:
             if item in self.lookups.keys() and self.lookups[item] is not None: