f

xios_examples/vertical_stratify_pressure/test_stratify_simple.py

@@ -19,10 +19,11 @@ class TestResampleAxis(xshared._TestCase):
     transient_outputs = ["axis_output.nc"]
     rtol = 5e-04
 
+    unittest.skip
     def test_pressure_stratification(self):
         # run the compiled Fortran XIOS programme
         with open('{}/xios.xml'.format(self.test_dir)) as cxml:
-            print(cxml.read())
+            print(cxml.read(), flush=True)
         subprocess.run(['mpiexec', '-n', '1', './resample.exe', ':',
                         '-n', '1', './xios_server.exe'],
                         cwd=self.test_dir, check=True)

xios_examples/vertical_stratify_scenarios/test_resample_cases.py

@@ -33,12 +33,13 @@ class TestResampleDomain(xshared._TestCase):
     tname = 'test_{}'.format(os.path.splitext(os.path.basename(f))[0])
     # add the test as an attribute (function) to the test class
         # add the test as an attribute (function) to the test class
-    if os.environ.get('MVER', '') == 'XIOS3/trunk':
-        # these tests are hitting exceptions with XIOS3
-        # but not XIOS2, so skip for XIOS3 runner
-        setattr(TestResampleDomain, tname,
-                unittest.skip(TestResampleDomain.make_a_resample_test(f)))
-    elif tname in known_failures:
+    # if os.environ.get('MVER', '') == 'XIOS3/trunk':
+    #     # these tests are hitting exceptions with XIOS3
+    #     # but not XIOS2, so skip for XIOS3 runner
+    #     setattr(TestResampleDomain, tname,
+    #             unittest.skip(TestResampleDomain.make_a_resample_test(f)))
+    # elif tname in known_failures:
+    if tname in known_failures:
         # set decorator @unittest.expectedFailure
         setattr(TestResampleDomain, tname,
                 unittest.expectedFailure(TestResampleDomain.make_a_resample_test(f)))