another type conv problem

ESMCI · Oct 10, 2017 · 90ddf5b · 90ddf5b
1 parent 6355cd8
commit 90ddf5b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/scripts/lib/CIME/SystemTests/ers.py b/scripts/lib/CIME/SystemTests/ers.py
@@ -28,7 +28,7 @@ def _ers_second_phase(self):
         stop_n      = self._case.get_value("STOP_N")
         stop_option = self._case.get_value("STOP_OPTION")
 
-        rest_n = stop_n/2 + 1
+        rest_n = int(stop_n/2 + 1)
         stop_new = stop_n - rest_n
         expect(stop_new > 0, "ERROR: stop_n value {:d} too short {:d} {:d}".format(stop_new,stop_n,rest_n))
 

diff --git a/scripts/lib/CIME/SystemTests/system_tests_common.py b/scripts/lib/CIME/SystemTests/system_tests_common.py
@@ -13,7 +13,7 @@
 
 import CIME.build as build
 
-import shutil, glob, gzip, time, traceback
+import shutil, glob, gzip, time, traceback, six
 
 logger = logging.getLogger(__name__)
 
@@ -239,10 +239,11 @@ def _coupler_log_indicates_run_complete(self):
         allgood = len(newestcpllogfiles)
         for cpllog in newestcpllogfiles:
             try:
-                if "SUCCESSFUL TERMINATION" in gzip.open(cpllog, 'rb').read():
+                if six.b("SUCCESSFUL TERMINATION") in gzip.open(cpllog, 'rb').read():
                     allgood = allgood - 1
-            except:
-                logger.info("{} is not compressed, assuming run failed".format(cpllog))
+            except BaseException as msg:
+
+                logger.info("{} is not compressed, assuming run failed {}".format(cpllog, msg))
 
         return allgood==0
 

diff --git a/scripts/tests/scripts_regression_tests.py b/scripts/tests/scripts_regression_tests.py
@@ -747,7 +747,7 @@ def setUp(self):
         self._baseline_area     = os.path.join(TEST_ROOT, "baselines")
         self._testroot          = TEST_ROOT
         self._hasbatch          = MACHINE.has_batch_system() and not NO_BATCH
-        self._do_teardown       = True # Will never do teardown if test failed
+        self._do_teardown       = False # Will never do teardown if test failed
 
     ###########################################################################
     def tearDown(self):