Moved irir-grib skip to iris.tests

SciTools · Oct 21, 2019 · 11826d2 · 11826d2
1 parent 95972c5
commit 11826d2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py
@@ -1206,6 +1206,12 @@ class MyPlotTests(test.GraphicsTest):
                             'which is not available.')
 
 
+# TODO: remove these skips when iris-grib is fixed
+skip_grib_fail = unittest.skipIf(True,
+                                 'Test(s) are failing due to known problems '
+                                 'with "iris-grib".')
+
+
 skip_sample_data = unittest.skipIf(not SAMPLE_DATA_AVAILABLE,
                                    ('Test(s) require "iris-sample-data", '
                                     'which is not available.'))

diff --git a/lib/iris/tests/integration/test_grib2.py b/lib/iris/tests/integration/test_grib2.py
@@ -22,7 +22,6 @@
 # Import iris.tests first so that some things can be initialised before
 # importing anything else.
 import iris.tests as tests
-from unittest import skip
 
 from cf_units import Unit
 import numpy.ma as ma
@@ -50,7 +49,7 @@ def test_gdt1(self):
         cube = load_cube(path)
         self.assertCMLApproxData(cube)
 
-    @skip('iris-grib is currently causing errors')
+    @tests.skip_grib_fail
     def test_gdt90_with_bitmap(self):
         path = tests.get_data_path(('GRIB', 'umukv', 'ukv_chan9.grib2'))
         cube = load_cube(path)
@@ -282,7 +281,7 @@ def test_regular(self):
         cube = load_cube(path)
         self.assertCMLApproxData(cube)
 
-    @skip('iris-grib is currently causing failures')
+    @tests.skip_grib_fail
     def test_reduced(self):
         path = tests.get_data_path(('GRIB', 'reduced', 'reduced_gg.grib2'))
         cube = load_cube(path)

diff --git a/lib/iris/tests/integration/test_grib_load.py b/lib/iris/tests/integration/test_grib_load.py
@@ -31,7 +31,6 @@
 # Import iris tests first so that some things can be initialised before
 # importing anything else
 import iris.tests as tests
-from unittest import skip
 
 import iris
 import iris.exceptions
@@ -132,7 +131,7 @@ def test_reduced_ll(self):
             ("GRIB", "reduced", "reduced_ll.grib1")))
         self.assertCML(cube, ("grib_load", "reduced_ll_grib1.cml"))
 
-    @skip('iris-grib is currently causing failures')
+    @tests.skip_grib_fail
     def test_reduced_gg(self):
         cube = iris.load_cube(tests.get_data_path(
             ("GRIB", "reduced", "reduced_gg.grib2")))