Fix remaining test failures

E3SM-Project · Jul 19, 2016 · 54e3916 · 54e3916
1 parent b36e2cd
commit 54e3916
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 11 deletions.
diff --git a/scripts/Tools/bless_test_results b/scripts/Tools/bless_test_results
@@ -14,7 +14,7 @@ from standard_script_setup import *
 
 import wait_for_tests, compare_namelists, simple_compare
 from CIME.system_test import NAMELIST_PHASE
-from CIME.utils import run_cmd, expect
+from CIME.utils import run_cmd, run_cmd_no_fail, expect
 from CIME.XML.machines import Machines
 
 import argparse, sys, os, glob, doctest, time

diff --git a/scripts/Tools/case.submit b/scripts/Tools/case.submit
@@ -44,7 +44,7 @@ OR
 
     args = parser.parse_args(args[1:])
 
-    expect(args.prereq is None, "--prereq not currently supported")
+    CIME.utils.expect(args.prereq is None, "--prereq not currently supported")
 
     CIME.utils.handle_standard_logging_options(args)
 

diff --git a/utils/python/CIME/SystemTests/system_tests_common.py b/utils/python/CIME/SystemTests/system_tests_common.py
@@ -55,7 +55,7 @@ def has_failed(self):
         return self._runstatus == "FAIL"
 
     def pass_test(self):
-        if not self.has_failed:
+        if not self.has_failed():
             self._runstatus = "PASS"
 
     def has_passed(self):

diff --git a/utils/python/CIME/XML/entry_id.py b/utils/python/CIME/XML/entry_id.py
@@ -183,8 +183,7 @@ def get_value(self, vid, attribute=None, resolved=True, subgroup=None):
         or from the values field if the attribute argument is provided
         and matches
         """
-        expect(subgroup is None, "Subgroup not supported")
-        logger.debug("Get Value")
+        logger.debug("Get Value (%s, %s, %s, %s)" % (vid, attribute, resolved, subgroup))
         val = None
         node = self.get_optional_node("entry", {"id":vid})
 
@@ -221,7 +220,6 @@ def get_values(self, item, attribute=None, resolved=True, subgroup=None): # (sel
         attribute to its associated value and group
         """
         logger.debug("(get_values) Input values: %s , %s , %s , %s , %s" ,  self.__class__.__name__ , item, attribute, resolved, subgroup)
-        expect(subgroup is None, "Subgroup not supported")
 
         nodes   = [] # List of identified xml elements
         results = [] # List of identified parameters

diff --git a/utils/python/CIME/case.py b/utils/python/CIME/case.py
@@ -218,7 +218,6 @@ def get_values(self, item=None, attribute=None, resolved=True, subgroup=None):
                 traceback.print_exc()
                 logger.debug("No get_values method for class %s (%s)" , env_file.__class__.__name__ , AttributeError)
 
-
             if result is not None and (len(result) >= 1):
 
                 if resolved :
@@ -239,9 +238,6 @@ def get_values(self, item=None, attribute=None, resolved=True, subgroup=None):
         logger.debug("(get_values) Return value:  %s" , results )
         return results
 
-
-
-
     def get_type_info(self, item):
         result = None
         for env_file in self._env_entryid_files:

diff --git a/utils/python/tests/scripts_regression_tests.py b/utils/python/tests/scripts_regression_tests.py
@@ -890,7 +890,7 @@ def test_cime_case(self):
 
             build_complete = run_cmd_no_fail("./xmlquery BUILD_COMPLETE -value",
                                              from_dir=casedir)
-            self.assertEqual(build_complete, "True",
+            self.assertEqual(build_complete, "TRUE",
                             msg="Build complete had wrong value '%s'" %
                             build_complete)