removed some unnecessary skippers, mostly on concatenate tests (#2388)

SciTools · Feb 23, 2017 · 758e8e1 · 758e8e1
1 parent 4fefe1f
commit 758e8e1
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 13 deletions.
diff --git a/lib/iris/tests/integration/concatenate/test_concatenate.py b/lib/iris/tests/integration/concatenate/test_concatenate.py
@@ -36,7 +36,6 @@
 from iris.util import unify_time_units
 
 
-@tests.skip_biggus
 class Test_concatenate__epoch(tests.IrisTest):
     def simple_1d_time_cubes(self, reftimes, coords_points):
         cubes = []
@@ -94,7 +93,6 @@ def test_diff_aux_coord(self):
         result = concatenate([cube_a, cube_b])
         self.assertEqual(len(result), 2)
 
-    @tests.skip_biggus
     def test_ignore_diff_aux_coord(self):
         cube_a = self.create_cube()
         cube_b = cube_a.copy()
@@ -133,7 +131,6 @@ def setUp(self):
         self.y_coord_non_monotonic = iris.coords.AuxCoord(
             [0, 30, 15], standard_name='latitude', units='degrees')
 
-    @tests.skip_biggus
     def test_matching_2d_longitudes(self):
         cube1 = self.cube
         cube1.add_dim_coord(self.y_coord, 1)
@@ -156,7 +153,6 @@ def test_differing_2d_longitudes(self):
         result = concatenate([cube1, cube2])
         self.assertEqual(len(result), 2)
 
-    @tests.skip_biggus
     def test_matching_non_monotonic_latitudes(self):
         cube1 = self.cube
         cube1.add_aux_coord(self.y_coord_non_monotonic, 1)

diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py
@@ -960,7 +960,6 @@ def test_slices(self):
         self.assert_is_lazy(lat_cube)
         self.assert_is_lazy(self.cube)
 
-    @tests.skip_biggus
     def test_cube_empty_indexing(self):
         test_filename = ('cube_slice', 'real_empty_data_indexing.cml')
         r = self.cube[:5, ::-1][3]

diff --git a/lib/iris/tests/test_constraints.py b/lib/iris/tests/test_constraints.py
@@ -75,7 +75,6 @@ def test_constraints(self):
         sub_list = self.slices.extract(constraint)
         self.assertEqual(len(sub_list), 70 * 6)
 
-    @tests.skip_biggus
     def test_mismatched_type(self):
         constraint = iris.Constraint(model_level_number='aardvark')
         sub_list = self.slices.extract(constraint)

diff --git a/lib/iris/tests/test_merge.py b/lib/iris/tests/test_merge.py
@@ -64,7 +64,6 @@ def test_duplication(self):
         self.assertEqual(len(cubes2), 2 * len(cubes))
 
 
-@tests.skip_biggus
 @tests.skip_data
 class TestSingleCube(tests.IrisTest, TestMixin):
     def setUp(self):
@@ -73,7 +72,6 @@ def setUp(self):
         self._prefix = 'theta'
 
 
-@tests.skip_biggus
 @tests.skip_data
 class TestMultiCube(tests.IrisTest, TestMixin):
     def setUp(self):
@@ -96,7 +94,6 @@ def custom_coord_callback(cube, field, filename):
             assert(cube.coord('time').attributes['brain'] == 'hurts')
 
 
-@tests.skip_biggus
 @tests.skip_data
 class TestColpex(tests.IrisTest):
     def setUp(self):
@@ -108,7 +105,6 @@ def test_colpex(self):
         self.assertCML(cubes, ('COLPEX', 'small_colpex_theta_p_alt.cml'))
 
 
-@tests.skip_biggus
 @tests.skip_data
 class TestDataMerge(tests.IrisTest):
     def test_extended_proxy_data(self):

diff --git a/lib/iris/tests/unit/concatenate/test_concatenate.py b/lib/iris/tests/unit/concatenate/test_concatenate.py
@@ -33,7 +33,6 @@
 from iris.exceptions import ConcatenateError
 
 
-@tests.skip_biggus
 class TestEpoch(tests.IrisTest):
     def simple_1d_time_cubes(self, reftimes, coords_points):
         cubes = []
@@ -172,7 +171,6 @@ def test_datatype_difference_message(self):
             result = concatenate([cube_1, cube_2], True)
 
 
-@tests.skip_biggus
 class TestOrder(tests.IrisTest):
     def _make_cube(self, points, bounds=None):
         nx = 4

diff --git a/lib/iris/tests/unit/cube/test_CubeList.py b/lib/iris/tests/unit/cube/test_CubeList.py
@@ -34,7 +34,6 @@
 from iris.fileformats.pp import STASH
 
 
-@tests.skip_biggus
 class Test_concatenate_cube(tests.IrisTest):
     def setUp(self):
         self.units = Unit('days since 1970-01-01 00:00:00',