Merge pull request #381 from jedwards4b/test_fixes

Properly report failures in component_compare_test

Also fixes #379 

Test suite: scripts_regression_tests - test outlined in issue #295 
Test baseline: 
Test namelist changes: 
Test status: bit for bit

Fixes: #379 #380 

User interface changes?:

Code review: sacks (ran passing and failing ERS tests as noted in issue #295)

scripts/Tools/component_compare_test.sh

@@ -394,4 +394,18 @@ else
     print_status "$overall_status" "$compare_info: test functionality summary ($msg)" "${testcase_base}"
 fi
 
+if [[ $overall_status == FAIL ]]; then
+  exit 1
+else
+  exit 0
+fi
+
+
+
+
+
+
+
+
+
 

utils/python/CIME/XML/env_mach_specific.py

@@ -289,9 +289,9 @@ def get_module_system_type(self):
 
     def get_module_system_init_path(self, lang):
         init_nodes = self.get_optional_node("init_path", attributes={"lang":lang})
-        return init_nodes.text if init_nodes else None
+        return init_nodes.text if init_nodes is not None else None
 
     def get_module_system_cmd_path(self, lang):
         cmd_nodes = self.get_optional_node("cmd_path", attributes={"lang":lang})
-        return cmd_nodes.text if cmd_nodes else None
+        return cmd_nodes.text if cmd_nodes is not None else None