From ec0066ec573bc14ae6fa7f1a99cb66d01d2a08af Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 12:12:33 +0000 Subject: [PATCH 1/7] Remove (almost all) test_cdm.py biggus skippers. --- lib/iris/tests/results/cdm/masked_cube.cml | 4 ++-- lib/iris/tests/test_cdm.py | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/iris/tests/results/cdm/masked_cube.cml b/lib/iris/tests/results/cdm/masked_cube.cml index c6ebc4d527..f281e3f192 100644 --- a/lib/iris/tests/results/cdm/masked_cube.cml +++ b/lib/iris/tests/results/cdm/masked_cube.cml @@ -1,6 +1,6 @@ - + @@ -36,6 +36,6 @@ - + diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py index db0b0b9696..249af6b225 100644 --- a/lib/iris/tests/test_cdm.py +++ b/lib/iris/tests/test_cdm.py @@ -1009,7 +1009,6 @@ def test_real_data_cube_indexing(self): self.assertRaises(IndexError, self.cube.__getitem__, ((0, 4, 5, 2), (3, 5, 5), 0, 0, 4) ) self.assertRaises(IndexError, self.cube.__getitem__, (Ellipsis, Ellipsis, Ellipsis, Ellipsis, Ellipsis, Ellipsis) ) - @tests.skip_biggus def test_fancy_indexing_bool_array(self): cube = self.cube cube.data = np.ma.masked_array(cube.data, mask=cube.data > 100000) @@ -1149,19 +1148,16 @@ def test_complete_field(self): self.assertIsInstance(cube.data, np.ndarray) - @tests.skip_biggus def test_masked_field(self): # This pp field has some missing data values cube = iris.load_cube(tests.get_data_path(["PP", "mdi_handmade_small", "mdi_test_1000_0.pp"])) self.assertIsInstance(cube.data, ma.core.MaskedArray) - @tests.skip_biggus def test_missing_file(self): cube = self._load_3d_cube() self.assertIsInstance(cube.data, ma.core.MaskedArray) self.assertCML(cube, ('cdm', 'masked_cube.cml')) - @tests.skip_biggus def test_slicing(self): cube = self._load_3d_cube() @@ -1186,7 +1182,7 @@ def test_save_and_merge(self): # extract the 2d field that has SOME missing values masked_slice = cube[0] masked_slice.data.fill_value = 123456 - + # test saving masked data reference_txt_path = tests.get_result_path(('cdm', 'masked_save_pp.txt')) with self.cube_save_test(reference_txt_path, reference_cubes=masked_slice) as temp_pp_path: From a164728651f590ee11bfd737017e41d321746113 Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 12:23:36 +0000 Subject: [PATCH 2/7] Remove all skippers from test_analysis_calculus.py --- .../results/analysis/calculus/curl_contrived_cartesian2.cml | 6 +++--- .../analysis/calculus/delta_handmade_simple_wrt_x.cml | 2 +- .../results/analysis/calculus/delta_handmade_wrt_lat.cml | 2 +- .../results/analysis/calculus/delta_handmade_wrt_lon.cml | 2 +- .../results/analysis/calculus/delta_handmade_wrt_x.cml | 2 +- .../results/analysis/calculus/delta_handmade_wrt_y.cml | 2 +- .../tests/results/analysis/calculus/grad_contrived1.cml | 2 +- .../tests/results/analysis/calculus/grad_contrived2.cml | 2 +- .../analysis/calculus/grad_contrived_non_spherical1.cml | 2 +- .../tests/results/analysis/calculus/handmade2_wrt_lat.cml | 2 +- .../tests/results/analysis/calculus/handmade2_wrt_lon.cml | 2 +- .../results/analysis/calculus/handmade_simple_wrt_x.cml | 2 +- .../tests/results/analysis/calculus/handmade_wrt_lat.cml | 2 +- .../tests/results/analysis/calculus/handmade_wrt_lon.cml | 2 +- lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml | 2 +- lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml | 2 +- lib/iris/tests/test_analysis_calculus.py | 5 ----- 17 files changed, 18 insertions(+), 23 deletions(-) diff --git a/lib/iris/tests/results/analysis/calculus/curl_contrived_cartesian2.cml b/lib/iris/tests/results/analysis/calculus/curl_contrived_cartesian2.cml index c580d0435b..a4b6230863 100644 --- a/lib/iris/tests/results/analysis/calculus/curl_contrived_cartesian2.cml +++ b/lib/iris/tests/results/analysis/calculus/curl_contrived_cartesian2.cml @@ -1,6 +1,6 @@ - + - + - + - + diff --git a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lat.cml b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lat.cml index 3e8e5d6308..df9e5f1f4d 100644 --- a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lat.cml +++ b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lat.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lon.cml b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lon.cml index aa770b68fe..c2ad700bd7 100644 --- a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lon.cml +++ b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_lon.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_x.cml b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_x.cml index 570b63dc28..78e0a15cb9 100644 --- a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_x.cml +++ b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_x.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_y.cml b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_y.cml index be37e86bbe..ea86c1d940 100644 --- a/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_y.cml +++ b/lib/iris/tests/results/analysis/calculus/delta_handmade_wrt_y.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/grad_contrived1.cml b/lib/iris/tests/results/analysis/calculus/grad_contrived1.cml index aac1534895..227c4d4951 100644 --- a/lib/iris/tests/results/analysis/calculus/grad_contrived1.cml +++ b/lib/iris/tests/results/analysis/calculus/grad_contrived1.cml @@ -1,6 +1,6 @@ - + - + - + - + - + - + diff --git a/lib/iris/tests/results/analysis/calculus/handmade_wrt_lat.cml b/lib/iris/tests/results/analysis/calculus/handmade_wrt_lat.cml index 634a7dae50..0d747f01c7 100644 --- a/lib/iris/tests/results/analysis/calculus/handmade_wrt_lat.cml +++ b/lib/iris/tests/results/analysis/calculus/handmade_wrt_lat.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/handmade_wrt_lon.cml b/lib/iris/tests/results/analysis/calculus/handmade_wrt_lon.cml index 5ec86b292e..b98addba19 100644 --- a/lib/iris/tests/results/analysis/calculus/handmade_wrt_lon.cml +++ b/lib/iris/tests/results/analysis/calculus/handmade_wrt_lon.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml b/lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml index 1db959cac9..b9b84358c3 100644 --- a/lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml +++ b/lib/iris/tests/results/analysis/calculus/handmade_wrt_x.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml b/lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml index d8db7ce14d..62c80fcef6 100644 --- a/lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml +++ b/lib/iris/tests/results/analysis/calculus/handmade_wrt_y.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/test_analysis_calculus.py b/lib/iris/tests/test_analysis_calculus.py index c46229e727..79e64a02fa 100644 --- a/lib/iris/tests/test_analysis_calculus.py +++ b/lib/iris/tests/test_analysis_calculus.py @@ -200,7 +200,6 @@ def test_cos(self): self.assertXMLElement(cos_of_coord_radians, ('analysis', 'calculus', 'cos_simple_radians.xml')) -@tests.skip_biggus class TestCalculusSimple3(tests.IrisTest): def setUp(self): @@ -223,7 +222,6 @@ def test_diff_wrt_lat(self): self.assertCMLApproxData(t, ('analysis', 'calculus', 'handmade2_wrt_lat.cml')) -@tests.skip_biggus class TestCalculusSimple2(tests.IrisTest): def setUp(self): @@ -275,7 +273,6 @@ def test_delta_wrt_lat(self): self.assertCMLApproxData(t, ('analysis', 'calculus', 'delta_handmade_wrt_lat.cml')) -@tests.skip_biggus class TestCalculusSimple1(tests.IrisTest): def setUp(self): @@ -337,7 +334,6 @@ def build_cube(data, spherical=False): return cube -@tests.skip_biggus class TestCalculusWKnownSolutions(tests.IrisTest): def get_coord_pts(self, cube): @@ -623,7 +619,6 @@ def test_standard_name(self): v.rename('northward_foobar2') self.assertRaises(ValueError, iris.analysis.calculus.spatial_vectors_with_phenom_name, u, v) - @tests.skip_biggus def test_rotated_pole(self): u = build_cube(np.empty((30, 20)), spherical='rotated') v = u.copy() From 5256fcb70b5dff1b2a8b3cf40e33d8665241bf9b Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 12:25:43 +0000 Subject: [PATCH 3/7] Remove all skippers from integration tests test_aggregated_cube and test_regridding. --- lib/iris/tests/integration/test_aggregated_cube.py | 1 - lib/iris/tests/integration/test_regridding.py | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/iris/tests/integration/test_aggregated_cube.py b/lib/iris/tests/integration/test_aggregated_cube.py index f44e3dc084..d670e932a2 100644 --- a/lib/iris/tests/integration/test_aggregated_cube.py +++ b/lib/iris/tests/integration/test_aggregated_cube.py @@ -28,7 +28,6 @@ from iris._lazy_data import is_lazy_data -@tests.skip_biggus class Test_aggregated_by(tests.IrisTest): @tests.skip_data def test_agg_by_aux_coord(self): diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py index bff8db878a..ef521aa395 100644 --- a/lib/iris/tests/integration/test_regridding.py +++ b/lib/iris/tests/integration/test_regridding.py @@ -34,7 +34,6 @@ from iris.analysis import UnstructuredNearest -@tests.skip_biggus @tests.skip_data class TestOSGBToLatLon(tests.IrisTest): def setUp(self): From 09efb61d01b8cd59b30fbfc55e56d15ced9afffa Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 12:36:50 +0000 Subject: [PATCH 4/7] Remove another biggus test skipper. --- .../experimental/test_regrid_ProjectedUnstructured.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py index 2b6ae58296..12a02abef6 100644 --- a/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py +++ b/lib/iris/tests/integration/experimental/test_regrid_ProjectedUnstructured.py @@ -66,7 +66,6 @@ def test_nearest_sinusoidal(self): self.assertArrayShapeStats(res[:, 0], (1, 73, 96), 299.99993826, 3.9223839688e-5) - @tests.skip_biggus def test_nearest_gnomonic_uk_domain(self): crs = ccrs.Gnomonic(central_latitude=60.0) uk_grid = self.global_grid.intersection(longitude=(-20, 20), @@ -110,7 +109,6 @@ def test_nearest_aux_factories(self): 299.99993826, 3.9226378869e-5) self.assertEqual(res.coord('altitude').shape, (6, 73, 96)) - @tests.skip_biggus def test_linear_sinusoidal(self): res = self.src.regrid(self.global_grid, ProjectedUnstructuredLinear()) self.assertArrayShapeStats(res, (1, 6, 73, 96), From e52466f03a1d67377433b6c265cd760bdfc1334a Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 13:53:48 +0000 Subject: [PATCH 5/7] Remove biggus test skippers for unit/analysis/subtract+multiply+divide --- .../analysis/maths/add/TestBroadcasting/collapse_all_dims.cml | 2 +- .../analysis/maths/add/TestBroadcasting/collapse_last_dims.cml | 2 +- .../analysis/maths/add/TestBroadcasting/collapse_middle_dim.cml | 2 +- .../analysis/maths/add/TestBroadcasting/collapse_zeroth_dim.cml | 2 +- .../results/unit/analysis/maths/add/TestBroadcasting/slice.cml | 2 +- .../unit/analysis/maths/add/TestBroadcasting/transposed.cml | 2 +- .../maths/multiply/TestBroadcasting/collapse_all_dims.cml | 2 +- .../maths/multiply/TestBroadcasting/collapse_last_dims.cml | 2 +- .../maths/multiply/TestBroadcasting/collapse_middle_dim.cml | 2 +- .../maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml | 2 +- .../unit/analysis/maths/multiply/TestBroadcasting/slice.cml | 2 +- .../analysis/maths/multiply/TestBroadcasting/transposed.cml | 2 +- .../maths/subtract/TestBroadcasting/collapse_all_dims.cml | 2 +- .../maths/subtract/TestBroadcasting/collapse_last_dims.cml | 2 +- .../maths/subtract/TestBroadcasting/collapse_middle_dim.cml | 2 +- .../maths/subtract/TestBroadcasting/collapse_zeroth_dim.cml | 2 +- .../unit/analysis/maths/subtract/TestBroadcasting/slice.cml | 2 +- .../analysis/maths/subtract/TestBroadcasting/transposed.cml | 2 +- lib/iris/tests/unit/analysis/maths/test_add.py | 1 - lib/iris/tests/unit/analysis/maths/test_multiply.py | 1 - lib/iris/tests/unit/analysis/maths/test_subtract.py | 1 - 21 files changed, 18 insertions(+), 21 deletions(-) diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_all_dims.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_all_dims.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_all_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_all_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_last_dims.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_last_dims.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_last_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_last_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_middle_dim.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_middle_dim.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_middle_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_middle_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_zeroth_dim.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_zeroth_dim.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_zeroth_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/collapse_zeroth_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/slice.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/slice.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/slice.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/slice.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/transposed.cml b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/transposed.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/transposed.cml +++ b/lib/iris/tests/results/unit/analysis/maths/add/TestBroadcasting/transposed.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_all_dims.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_all_dims.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_all_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_all_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_last_dims.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_last_dims.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_last_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_last_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_middle_dim.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_middle_dim.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_middle_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_middle_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/collapse_zeroth_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/slice.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/slice.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/slice.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/slice.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/transposed.cml b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/transposed.cml index 417b759559..60d019c3b8 100644 --- a/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/transposed.cml +++ b/lib/iris/tests/results/unit/analysis/maths/multiply/TestBroadcasting/transposed.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_all_dims.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_all_dims.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_all_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_all_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_last_dims.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_last_dims.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_last_dims.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_last_dims.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_middle_dim.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_middle_dim.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_middle_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_middle_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_zeroth_dim.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_zeroth_dim.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_zeroth_dim.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/collapse_zeroth_dim.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/slice.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/slice.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/slice.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/slice.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/transposed.cml b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/transposed.cml index 2d63e69441..ae3e59b9d0 100644 --- a/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/transposed.cml +++ b/lib/iris/tests/results/unit/analysis/maths/subtract/TestBroadcasting/transposed.cml @@ -1,6 +1,6 @@ - + diff --git a/lib/iris/tests/unit/analysis/maths/test_add.py b/lib/iris/tests/unit/analysis/maths/test_add.py index 79b5a475ef..1e24c3cf18 100644 --- a/lib/iris/tests/unit/analysis/maths/test_add.py +++ b/lib/iris/tests/unit/analysis/maths/test_add.py @@ -30,7 +30,6 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin -@tests.skip_biggus @tests.skip_data @tests.iristest_timing_decorator class TestBroadcasting(tests.IrisTest_nometa, diff --git a/lib/iris/tests/unit/analysis/maths/test_multiply.py b/lib/iris/tests/unit/analysis/maths/test_multiply.py index 3a738f488e..3bcc401ad1 100644 --- a/lib/iris/tests/unit/analysis/maths/test_multiply.py +++ b/lib/iris/tests/unit/analysis/maths/test_multiply.py @@ -30,7 +30,6 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin -@tests.skip_biggus @tests.skip_data @tests.iristest_timing_decorator class TestBroadcasting(tests.IrisTest_nometa, diff --git a/lib/iris/tests/unit/analysis/maths/test_subtract.py b/lib/iris/tests/unit/analysis/maths/test_subtract.py index da428c21fc..68e5f4de60 100644 --- a/lib/iris/tests/unit/analysis/maths/test_subtract.py +++ b/lib/iris/tests/unit/analysis/maths/test_subtract.py @@ -30,7 +30,6 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin -@tests.skip_biggus @tests.skip_data @tests.iristest_timing_decorator class TestBroadcasting(tests.IrisTest_nometa, From f4caa02fa12ce64e59261d4d5bc68d8652bbe141 Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 16:04:25 +0000 Subject: [PATCH 6/7] Remove biggus test skippers from pyke rule tests. --- .../fc_rules_cf_fc/test_build_auxiliary_coordinate.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py index 31549aa00a..69fa4ca643 100644 --- a/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py +++ b/lib/iris/tests/unit/fileformats/pyke_rules/compiled_krb/fc_rules_cf_fc/test_build_auxiliary_coordinate.py @@ -69,7 +69,6 @@ def patched__getitem__(proxy_self, keys): 'iris.fileformats.netcdf.NetCDFDataProxy.__getitem__', new=patched__getitem__) - @tests.skip_biggus def test_slowest_varying_vertex_dim(self): # Create the bounds cf variable. bounds = np.arange(24).reshape(4, 2, 3) From e298701bc1c63a38c296746fda036f5724dad7e9 Mon Sep 17 00:00:00 2001 From: lbdreyer Date: Tue, 21 Mar 2017 17:07:14 +0000 Subject: [PATCH 7/7] Remove biggus test skipper from curvilinear regridder test. --- .../tests/unit/experimental/regrid/test__CurvilinearRegridder.py | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/iris/tests/unit/experimental/regrid/test__CurvilinearRegridder.py b/lib/iris/tests/unit/experimental/regrid/test__CurvilinearRegridder.py index a294414cfb..99dd0c483b 100644 --- a/lib/iris/tests/unit/experimental/regrid/test__CurvilinearRegridder.py +++ b/lib/iris/tests/unit/experimental/regrid/test__CurvilinearRegridder.py @@ -190,7 +190,6 @@ def test_bad_src_shape(self): self.regridder(self.src_grid[::2, ::2]) -@tests.skip_biggus class Test__call__multidimensional(tests.IrisTest): def test_multidim(self): # Testing with >2D data to demonstrate correct operation over