Merge pull request #4928 from billsacks/revert_unnecessary_warning_removal

Revert "Merge pull request #4913 from jedwards4b/fix/python_warning"

This reverts commit 991e19b, reversing changes made to e752d03.

This reverts the changes in #4913

This is no longer needed given #4927

Author: billsacks

CIME/tests/test_sys_cime_case.py

@@ -45,13 +45,9 @@ def test_cime_case(self):
             )
 
             case.flush()
-            # the strip().splitlines()[-1] avoids a potential warning message in the output.
-            build_complete = (
-                utils.run_cmd_no_fail(
-                    "./xmlquery BUILD_COMPLETE --value", from_dir=casedir
-                )
-                .strip()
-                .splitlines()[-1]
+
+            build_complete = utils.run_cmd_no_fail(
+                "./xmlquery BUILD_COMPLETE --value", from_dir=casedir
             )
             self.assertEqual(
                 build_complete,
@@ -346,26 +342,16 @@ def test_cime_case_xmlchange_append(self):
         self.run_cmd_assert_result(
             "./xmlchange --id PIO_CONFIG_OPTS --val='-opt1'", from_dir=casedir
         )
-        # Avoids a potential warning in output about python version
-        result = (
-            self.run_cmd_assert_result(
-                "./xmlquery --value PIO_CONFIG_OPTS", from_dir=casedir
-            )
-            .strip()
-            .splitlines()[-1]
+        result = self.run_cmd_assert_result(
+            "./xmlquery --value PIO_CONFIG_OPTS", from_dir=casedir
         )
         self.assertEqual(result, "-opt1")
 
         self.run_cmd_assert_result(
             "./xmlchange --id PIO_CONFIG_OPTS --val='-opt2' --append", from_dir=casedir
         )
-        # the strip().splitlines()[-1] avoids a potential warning message in the output.
-        result = (
-            self.run_cmd_assert_result(
-                "./xmlquery --value PIO_CONFIG_OPTS", from_dir=casedir
-            )
-            .strip()
-            .splitlines()[-1]
+        result = self.run_cmd_assert_result(
+            "./xmlquery --value PIO_CONFIG_OPTS", from_dir=casedir
         )
         self.assertEqual(result, "-opt1 -opt2")
 
@@ -519,14 +505,10 @@ def test_cime_case_test_walltime_mgmt_6(self):
         )
 
         self.run_cmd_assert_result("./case.setup --reset", from_dir=casedir)
-        # the strip().splitlines()[-1] avoids a potential warning message in the output.
-        result = (
-            self.run_cmd_assert_result(
-                "./xmlquery JOB_WALLCLOCK_TIME --subgroup=case.test --value",
-                from_dir=casedir,
-            )
-            .strip()
-            .splitlines()[-1]
+
+        result = self.run_cmd_assert_result(
+            "./xmlquery JOB_WALLCLOCK_TIME --subgroup=case.test --value",
+            from_dir=casedir,
         )
         with Case(casedir) as case:
             walltime_format = case.get_value("walltime_format", subgroup=None)
@@ -553,14 +535,9 @@ def test_cime_case_test_walltime_mgmt_7(self):
 
         self.run_cmd_assert_result("./case.setup --reset", from_dir=casedir)
 
-        # the strip().splitlines()[-1] avoids a potential warning message in the output.
-        result = (
-            self.run_cmd_assert_result(
-                "./xmlquery JOB_WALLCLOCK_TIME --subgroup=case.test --value",
-                from_dir=casedir,
-            )
-            .strip()
-            .splitlines()[-1]
+        result = self.run_cmd_assert_result(
+            "./xmlquery JOB_WALLCLOCK_TIME --subgroup=case.test --value",
+            from_dir=casedir,
         )
         with Case(casedir) as case:
             walltime_format = case.get_value("walltime_format", subgroup=None)
@@ -620,16 +597,10 @@ def test_cime_case_test_custom_project(self):
             env_changes="unset CIME_GLOBAL_WALLTIME &&",
         )
 
-        # the strip().splitlines()[-1] avoids a potential warning message in the output.
-        result = (
-            self.run_cmd_assert_result(
-                "./xmlquery --non-local --value PROJECT --subgroup=case.test",
-                from_dir=casedir,
-            )
-            .strip()
-            .splitlines()[-1]
+        result = self.run_cmd_assert_result(
+            "./xmlquery --non-local --value PROJECT --subgroup=case.test",
+            from_dir=casedir,
         )
-
         self.assertEqual(result, "testproj")
 
     def test_create_test_longname(self):

CIME/tests/test_sys_create_newcase.py

@@ -314,10 +314,7 @@ def test_e_xmlquery(self):
             COMP_CLASSES = case.get_values("COMP_CLASSES")
             BUILD_COMPLETE = case.get_value("BUILD_COMPLETE")
             cmd = xmlquery + " --non-local STOP_N --value"
-            # avoid a potential warning in output by only looking at the last line
-            output = (
-                utils.run_cmd_no_fail(cmd, from_dir=casedir).strip().splitlines()[-1]
-            )
+            output = utils.run_cmd_no_fail(cmd, from_dir=casedir)
             self.assertTrue(output == str(STOP_N), msg="%s != %s" % (output, STOP_N))
             cmd = xmlquery + " --non-local BUILD_COMPLETE --value"
             output = utils.run_cmd_no_fail(cmd, from_dir=casedir)
@@ -339,35 +336,19 @@ def test_e_xmlquery(self):
             for comp in COMP_CLASSES:
                 caseresult = case.get_value("NTASKS_%s" % comp)
                 cmd = xmlquery + " --non-local NTASKS_%s --value" % comp
-                # avoid a potential warning in output by only looking at the last line
-                output = (
-                    utils.run_cmd_no_fail(cmd, from_dir=casedir)
-                    .strip()
-                    .splitlines()[-1]
-                )
-
+                output = utils.run_cmd_no_fail(cmd, from_dir=casedir)
                 self.assertTrue(
                     output == str(caseresult), msg="%s != %s" % (output, caseresult)
                 )
                 cmd = xmlquery + " --non-local NTASKS --subgroup %s --value" % comp
-                # avoid a potential warning in output by only looking at the last line
-                output = (
-                    utils.run_cmd_no_fail(cmd, from_dir=casedir)
-                    .strip()
-                    .splitlines()[-1]
-                )
+                output = utils.run_cmd_no_fail(cmd, from_dir=casedir)
                 self.assertTrue(
                     output == str(caseresult), msg="%s != %s" % (output, caseresult)
                 )
             if self.MACHINE.has_batch_system():
                 JOB_QUEUE = case.get_value("JOB_QUEUE", subgroup="case.run")
                 cmd = xmlquery + " --non-local JOB_QUEUE --subgroup case.run --value"
-                # avoid a potential warning in output by only looking at the last line
-                output = (
-                    utils.run_cmd_no_fail(cmd, from_dir=casedir)
-                    .strip()
-                    .splitlines()[-1]
-                )
+                output = utils.run_cmd_no_fail(cmd, from_dir=casedir)
                 self.assertTrue(
                     output == JOB_QUEUE, msg="%s != %s" % (output, JOB_QUEUE)
                 )