diff --git a/.travis.yml b/.travis.yml index 471c8bd9f6..8be37e15b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ git: depth: 10000 install: - - export IRIS_TEST_DATA_REF="e8e62ab79a2f8789f01f8dfa9829915984a39b2a" + - export IRIS_TEST_DATA_REF="a754fc977d30fdcdacb820b5a5fabd91056afc7b" - export IRIS_TEST_DATA_SUFFIX=$(echo "${IRIS_TEST_DATA_REF}" | sed "s/^v//") # Install miniconda @@ -75,9 +75,11 @@ install: - python -c 'import cartopy; cartopy.io.shapereader.natural_earth()' # iris test data - - wget -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip - - unzip -q iris-test-data.zip - - ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data + - if [[ "$TEST_MINIMAL" != true ]]; then + wget -O iris-test-data.zip https://github.com/SciTools/iris-test-data/archive/${IRIS_TEST_DATA_REF}.zip; + unzip -q iris-test-data.zip; + ln -s $(pwd)/iris-test-data-${IRIS_TEST_DATA_SUFFIX} iris-test-data; + fi # prepare iris build directory - python setup.py --with-unpack build_ext --include-dirs=${PREFIX}/include --library-dirs=${PREFIX}/lib diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py index d732a70072..648f144b0f 100644 --- a/lib/iris/tests/__init__.py +++ b/lib/iris/tests/__init__.py @@ -183,7 +183,10 @@ def get_data_path(relative_path): """ if not isinstance(relative_path, six.string_types): relative_path = os.path.join(*relative_path) - data_path = os.path.join(iris.config.TEST_DATA_DIR, relative_path) + test_data_dir = iris.config.TEST_DATA_DIR + if test_data_dir is None: + test_data_dir = '' + data_path = os.path.join(test_data_dir, relative_path) if _EXPORT_DATAPATHS_FILE is not None: _EXPORT_DATAPATHS_FILE.write(data_path + '\n') diff --git a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py index 2bcf89da35..8fdd3ee9ab 100644 --- a/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py +++ b/lib/iris/tests/experimental/regrid/test_regrid_area_weighted_rectilinear_src_and_grid.py @@ -155,6 +155,7 @@ def _resampled_grid(cube, x_samplefactor, y_samplefactor): return new_cube +@tests.skip_data class TestAreaWeightedRegrid(tests.IrisTest): def setUp(self): # A cube with a hybrid height derived coordinate. diff --git a/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py b/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py index cfc219bfc2..2f553da8ee 100644 --- a/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py +++ b/lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py @@ -226,6 +226,7 @@ def test_simple_missing_data(self): [True, False, False, False, True], [True, True, True, True, True]]) + @tests.skip_data def test_multidimensional(self): """ Check valid operation on a multidimensional cube. diff --git a/lib/iris/tests/integration/test_netcdf.py b/lib/iris/tests/integration/test_netcdf.py index de998564ba..20e1e95bbd 100644 --- a/lib/iris/tests/integration/test_netcdf.py +++ b/lib/iris/tests/integration/test_netcdf.py @@ -44,6 +44,7 @@ import iris.tests.stock as stock +@tests.skip_data class TestHybridPressure(tests.IrisTest): def setUp(self): # Modify stock cube so it is suitable to have a @@ -79,6 +80,7 @@ def test_save_load_loop(self): self.assertEqual(cube, other_cube) +@tests.skip_data class TestSaveMultipleAuxFactories(tests.IrisTest): def test_hybrid_height_and_pressure(self): cube = stock.realistic_4d() @@ -306,6 +308,7 @@ def test_unknown_method(self): shutil.rmtree(temp_dirpath) +@tests.skip_data class TestCoordSystem(tests.IrisTest): def test_load_laea_grid(self): cube = iris.load_cube( diff --git a/lib/iris/tests/integration/test_pp.py b/lib/iris/tests/integration/test_pp.py index a327b8ca66..8bf3880d0a 100644 --- a/lib/iris/tests/integration/test_pp.py +++ b/lib/iris/tests/integration/test_pp.py @@ -637,6 +637,7 @@ def test_time_mean_and_zonal_mean(self): self.assertEqual(int(field.lbproc), 192) +@tests.skip_data class TestCallbackLoad(tests.IrisTest): def setUp(self): self.pass_name = 'air_potential_temperature' diff --git a/lib/iris/tests/stock.py b/lib/iris/tests/stock.py index cd5c1bb3c2..df63472690 100644 --- a/lib/iris/tests/stock.py +++ b/lib/iris/tests/stock.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -471,8 +471,9 @@ def realistic_4d(): # >>> arrays.append(theta.data) # >>> arrays.append(theta.coord('sigma').coord_system.orography.data) # >>> np.savez('stock_arrays.npz', *arrays) - - data_path = os.path.join(os.path.dirname(__file__), 'stock_arrays.npz') + data_path = tests.get_data_path(('stock', 'stock_arrays.npz')) + if not os.path.isfile(data_path): + raise IOError('Test data is not available at {}.'.format(data_path)) r = np.load(data_path) # sort the arrays based on the order they were originally given. The names given are of the form 'arr_1' or 'arr_10' _, arrays = zip(*sorted(six.iteritems(r), key=lambda item: int(item[0][4:]))) @@ -526,7 +527,9 @@ def realistic_4d_no_derived(): def realistic_4d_w_missing_data(): - data_path = os.path.join(os.path.dirname(__file__), 'stock_mdi_arrays.npz') + data_path = tests.get_data_path(('stock', 'stock_mdi_arrays.npz')) + if not os.path.isfile(data_path): + raise IOError('Test data is not available at {}.'.format(data_path)) data_archive = np.load(data_path) data = ma.masked_array(data_archive['arr_0'], mask=data_archive['arr_1']) diff --git a/lib/iris/tests/stock_arrays.npz b/lib/iris/tests/stock_arrays.npz deleted file mode 100644 index 76fa668266..0000000000 Binary files a/lib/iris/tests/stock_arrays.npz and /dev/null differ diff --git a/lib/iris/tests/test_analysis.py b/lib/iris/tests/test_analysis.py index fe13dd4214..8e2f057899 100644 --- a/lib/iris/tests/test_analysis.py +++ b/lib/iris/tests/test_analysis.py @@ -656,6 +656,7 @@ def test_area_weights(self): self.assertCML(small_cube, ('analysis', 'areaweights_original.cml'), checksum=False) +@tests.skip_data class TestAreaWeightGeneration(tests.IrisTest): def setUp(self): self.cube = iris.tests.stock.realistic_4d() diff --git a/lib/iris/tests/test_analysis_calculus.py b/lib/iris/tests/test_analysis_calculus.py index 4464f135f8..39b506e79b 100644 --- a/lib/iris/tests/test_analysis_calculus.py +++ b/lib/iris/tests/test_analysis_calculus.py @@ -37,6 +37,7 @@ class TestCubeDelta(tests.IrisTest): + @tests.skip_data def test_invalid(self): cube = iris.tests.stock.realistic_4d() with self.assertRaises(iris.exceptions.CoordinateMultiDimError): diff --git a/lib/iris/tests/test_cdm.py b/lib/iris/tests/test_cdm.py index 15e5a7948f..38b94fa999 100644 --- a/lib/iris/tests/test_cdm.py +++ b/lib/iris/tests/test_cdm.py @@ -214,6 +214,7 @@ def test_immutable_auxcoord_dims(self): dims[0] = 1 +@tests.skip_data class TestStockCubeStringRepresentations(tests.IrisTest): def setUp(self): self.cube = iris.tests.stock.realistic_4d() @@ -276,10 +277,12 @@ def test_dot_simple_pp(self): del cube.attributes['my_attribute'] # TODO hybrid height and dot output - relatitionship links + @tests.skip_data def test_dot_4d(self): cube = iris.tests.stock.realistic_4d() self.check_dot(cube, ('file_load', '4d_pp.dot')) + @tests.skip_data def test_missing_coords(self): cube = iris.tests.stock.realistic_4d() cube.remove_coord('time') @@ -289,6 +292,7 @@ def test_missing_coords(self): self.assertString(str(cube), ('cdm', 'str_repr', 'missing_coords_cube.str.txt')) + @tests.skip_data def test_cubelist_string(self): cube_list = iris.cube.CubeList([iris.tests.stock.realistic_4d(), iris.tests.stock.global_pp()]) @@ -1069,8 +1073,9 @@ def test_multi_d(self): # Ensure no side effects self.assertCML(cube, ('cube_collapsed', 'original.cml')) - - + + +@tests.skip_data class TestTrimAttributes(tests.IrisTest): def test_non_string_attributes(self): cube = iris.tests.stock.realistic_4d() @@ -1155,6 +1160,7 @@ def test_save_and_merge(self): self.assertEqual(merged_cube.data.fill_value, 123456) +@tests.skip_data class TestConversionToCoordList(tests.IrisTest): def test_coord_conversion(self): cube = iris.tests.stock.realistic_4d() diff --git a/lib/iris/tests/test_constraints.py b/lib/iris/tests/test_constraints.py index 6977a29d48..e3de548265 100644 --- a/lib/iris/tests/test_constraints.py +++ b/lib/iris/tests/test_constraints.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -43,8 +43,11 @@ def workaround_pending_1262(cubes): cubes[i] = cube[::-1] +@tests.skip_data class TestSimple(tests.IrisTest): - slices = iris.cube.CubeList(stock.realistic_4d().slices(['grid_latitude', 'grid_longitude'])) + def setUp(self): + names = ['grid_latitude', 'grid_longitude'] + self.slices = iris.cube.CubeList(stock.realistic_4d().slices(names)) def test_constraints(self): constraint = iris.Constraint(model_level_number=10) diff --git a/lib/iris/tests/test_coord_api.py b/lib/iris/tests/test_coord_api.py index 08bff9b56d..5e2811d6ad 100644 --- a/lib/iris/tests/test_coord_api.py +++ b/lib/iris/tests/test_coord_api.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -106,6 +106,7 @@ def test_lazy_shared_data(self): self._check_shared_data(self.coord) +@tests.skip_data class TestCoordSlicing(unittest.TestCase): def setUp(self): cube = iris.tests.stock.realistic_4d() @@ -207,6 +208,7 @@ def test_no_intersection_on_unit(self): self.a.units = 'kilometer' self.assertRaises(ValueError, self.a.intersect, self.b) + @tests.skip_data def test_commutative(self): cube = iris.tests.stock.realistic_4d() coord = cube.coord('grid_longitude') @@ -232,6 +234,7 @@ def test_complex(self): self.assertXMLElement(coord, ('coord_api', 'complex.xml')) +@tests.skip_data class TestCoord_ReprStr_nontime(tests.IrisTest): def setUp(self): self.lat = iris.tests.stock.realistic_4d().coord('grid_latitude')[:10] @@ -253,6 +256,7 @@ def test_AuxCoord_str(self): ('coord_api', 'str_repr', 'aux_nontime_str.txt')) +@tests.skip_data class TestCoord_ReprStr_time(tests.IrisTest): def setUp(self): self.time = iris.tests.stock.realistic_4d().coord('time') @@ -596,6 +600,7 @@ def test_nd_bounds(self): self.assertCML(pcube, ("coord_api", "nd_bounds.cml")) +@tests.skip_data class TestGetterSetter(tests.IrisTest): def test_get_set_points_and_bounds(self): cube = iris.tests.stock.realistic_4d() diff --git a/lib/iris/tests/test_cube_to_pp.py b/lib/iris/tests/test_cube_to_pp.py index 6c222cd300..dab7298570 100644 --- a/lib/iris/tests/test_cube_to_pp.py +++ b/lib/iris/tests/test_cube_to_pp.py @@ -297,7 +297,8 @@ def test_pp_save_rules(self): self.assertEqual(self.lbproc_from_pp(temp_filename), lbproc) os.remove(temp_filename) - + + @tests.skip_data def test_lbvc(self): cube = stock.realistic_4d_no_derived()[0, :4, ...] diff --git a/lib/iris/tests/test_hybrid.py b/lib/iris/tests/test_hybrid.py index eeef1c394d..8e87512796 100644 --- a/lib/iris/tests/test_hybrid.py +++ b/lib/iris/tests/test_hybrid.py @@ -37,6 +37,7 @@ @tests.skip_plot +@tests.skip_data class TestRealistic4d(tests.GraphicsTest): def setUp(self): super(TestRealistic4d, self).setUp() @@ -160,6 +161,7 @@ def test_bounded_orography(self): bounds = altitude.bounds +@tests.skip_data class TestHybridPressure(tests.IrisTest): def setUp(self): # Convert the hybrid-height into hybrid-pressure... diff --git a/lib/iris/tests/test_iterate.py b/lib/iris/tests/test_iterate.py index 2a53cbc946..6fd601ae19 100644 --- a/lib/iris/tests/test_iterate.py +++ b/lib/iris/tests/test_iterate.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -40,6 +40,7 @@ from functools import reduce +@tests.skip_data class TestIterateFunctions(tests.IrisTest): def setUp(self): diff --git a/lib/iris/tests/test_mapping.py b/lib/iris/tests/test_mapping.py index 665a3097f4..75a8690937 100644 --- a/lib/iris/tests/test_mapping.py +++ b/lib/iris/tests/test_mapping.py @@ -47,8 +47,11 @@ @tests.skip_plot +@tests.skip_data class TestBasic(tests.GraphicsTest): - cube = iris.tests.stock.realistic_4d() + def setUp(self): + super(TestBasic, self).setUp() + self.cube = iris.tests.stock.realistic_4d() def test_contourf(self): cube = self.cube[0, 0] diff --git a/lib/iris/tests/test_netcdf.py b/lib/iris/tests/test_netcdf.py index b9d5ed905a..6463122409 100644 --- a/lib/iris/tests/test_netcdf.py +++ b/lib/iris/tests/test_netcdf.py @@ -300,6 +300,7 @@ def test_bad_permissions(self): os.rmdir(dir_name) +@tests.skip_data class TestSave(tests.IrisTest): def test_hybrid(self): cube = stock.realistic_4d() diff --git a/lib/iris/tests/test_plot.py b/lib/iris/tests/test_plot.py index 63b50eef93..2b9f38688f 100644 --- a/lib/iris/tests/test_plot.py +++ b/lib/iris/tests/test_plot.py @@ -42,6 +42,7 @@ import iris.symbols +@tests.skip_data def simple_cube(): cube = iris.tests.stock.realistic_4d() cube = cube[:, 0, 0, :] @@ -102,6 +103,7 @@ def test_missing_cs(self): @tests.skip_plot +@tests.skip_data class TestHybridHeight(tests.GraphicsTest): def setUp(self): super(TestHybridHeight, self).setUp() @@ -151,6 +153,7 @@ def test_orography(self): @tests.skip_plot +@tests.skip_data class Test1dPlotMultiArgs(tests.GraphicsTest): # tests for iris.plot using multi-argument calling convention @@ -367,6 +370,7 @@ def inner(*args, **kwargs): @cache +@tests.skip_data def _load_4d_testcube(): # Load example 4d data (TZYX). test_cube = iris.tests.stock.realistic_4d() diff --git a/lib/iris/tests/test_trajectory.py b/lib/iris/tests/test_trajectory.py index f64de6baed..11e8f09923 100644 --- a/lib/iris/tests/test_trajectory.py +++ b/lib/iris/tests/test_trajectory.py @@ -29,6 +29,7 @@ import iris.tests.stock +@tests.skip_data class TestSimple(tests.IrisTest): def test_invalid_coord(self): cube = iris.tests.stock.realistic_4d() diff --git a/lib/iris/tests/test_util.py b/lib/iris/tests/test_util.py index bc77d0d7b8..5ffa33d30b 100644 --- a/lib/iris/tests/test_util.py +++ b/lib/iris/tests/test_util.py @@ -184,6 +184,7 @@ def test_trim_string_with_no_spaces(self): 'expected value is %s' % (len(result), expected_length)) +@tests.skip_data class TestDescribeDiff(iris.tests.IrisTest): def test_identical(self): test_cube_a = stock.realistic_4d() @@ -262,6 +263,7 @@ def test_output_file(self): 'incompatible_cubes.str.txt') +@tests.skip_data class TestAsCompatibleShape(tests.IrisTest): def test_slice(self): cube = tests.stock.realistic_4d() diff --git a/lib/iris/tests/unit/analysis/cartography/test_project.py b/lib/iris/tests/unit/analysis/cartography/test_project.py index 5e4ef047dd..4adf824107 100644 --- a/lib/iris/tests/unit/analysis/cartography/test_project.py +++ b/lib/iris/tests/unit/analysis/cartography/test_project.py @@ -70,28 +70,33 @@ def test_is_iris_coord_system(self): self.assertIsNot(res.coord('projection_x_coordinate').coord_system, self.tcs) + @tests.skip_data def test_bad_resolution_negative(self): cube = low_res_4d() with self.assertRaises(ValueError): project(cube, ROBINSON, nx=-200, ny=200) + @tests.skip_data def test_bad_resolution_non_numeric(self): cube = low_res_4d() with self.assertRaises(ValueError): project(cube, ROBINSON, nx=200, ny='abc') + @tests.skip_data def test_missing_lat(self): cube = low_res_4d() cube.remove_coord('grid_latitude') with self.assertRaises(ValueError): project(cube, ROBINSON) + @tests.skip_data def test_missing_lon(self): cube = low_res_4d() cube.remove_coord('grid_longitude') with self.assertRaises(ValueError): project(cube, ROBINSON) + @tests.skip_data def test_missing_latlon(self): cube = low_res_4d() cube.remove_coord('grid_longitude') @@ -99,40 +104,47 @@ def test_missing_latlon(self): with self.assertRaises(ValueError): project(cube, ROBINSON) + @tests.skip_data def test_default_resolution(self): cube = low_res_4d() new_cube, extent = project(cube, ROBINSON) self.assertEqual(new_cube.shape, cube.shape) + @tests.skip_data def test_explicit_resolution(self): cube = low_res_4d() nx, ny = 5, 4 new_cube, extent = project(cube, ROBINSON, nx=nx, ny=ny) self.assertEqual(new_cube.shape, cube.shape[:2] + (ny, nx)) + @tests.skip_data def test_explicit_resolution_single_point(self): cube = low_res_4d() nx, ny = 1, 1 new_cube, extent = project(cube, ROBINSON, nx=nx, ny=ny) self.assertEqual(new_cube.shape, cube.shape[:2] + (ny, nx)) + @tests.skip_data def test_mismatched_coord_systems(self): cube = low_res_4d() cube.coord('grid_longitude').coord_system = None with self.assertRaises(ValueError): project(cube, ROBINSON) + @tests.skip_data def test_extent(self): cube = low_res_4d() _, extent = project(cube, ROBINSON) self.assertEqual(extent, [-17005833.33052523, 17005833.33052523, -8625155.12857459, 8625155.12857459]) + @tests.skip_data def test_cube(self): cube = low_res_4d() new_cube, _ = project(cube, ROBINSON) self.assertCMLApproxData(new_cube) + @tests.skip_data def test_no_coord_system(self): cube = low_res_4d() cube.coord('grid_longitude').coord_system = None diff --git a/lib/iris/tests/unit/analysis/interpolate/test_linear.py b/lib/iris/tests/unit/analysis/interpolate/test_linear.py index 22c9523de5..7ea69ded34 100644 --- a/lib/iris/tests/unit/analysis/interpolate/test_linear.py +++ b/lib/iris/tests/unit/analysis/interpolate/test_linear.py @@ -64,6 +64,7 @@ def test_sample_point_iterable(self): self._assert_expected_call(sample_points, sample_points_call) +@tests.skip_data class Test_masks(tests.IrisTest): def test_mask_retention(self): cube = stock.realistic_4d_w_missing_data() diff --git a/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py b/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py index d4fc866714..457bd207f1 100644 --- a/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py +++ b/lib/iris/tests/unit/analysis/interpolation/test_get_xy_dim_coords.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2013 - 2015, Met Office +# (C) British Crown Copyright 2013 - 2016, Met Office # # This file is part of Iris. # @@ -38,6 +38,7 @@ class TestGetXYCoords(tests.IrisTest): + @tests.skip_data def test_grid_lat_lon(self): cube = iris.tests.stock.realistic_4d() x, y = get_xy_dim_coords(cube) @@ -58,18 +59,21 @@ def test_projection_coords(self): self.assertIs(x, cube.coord('projection_x_coordinate')) self.assertIs(y, cube.coord('projection_y_coordinate')) + @tests.skip_data def test_missing_x_coord(self): cube = iris.tests.stock.realistic_4d() cube.remove_coord('grid_longitude') with self.assertRaises(ValueError): get_xy_dim_coords(cube) + @tests.skip_data def test_missing_y_coord(self): cube = iris.tests.stock.realistic_4d() cube.remove_coord('grid_latitude') with self.assertRaises(ValueError): get_xy_dim_coords(cube) + @tests.skip_data def test_multiple_coords(self): cube = iris.tests.stock.realistic_4d() cs = iris.coord_systems.GeogCS(6371229) diff --git a/lib/iris/tests/unit/analysis/maths/test_add.py b/lib/iris/tests/unit/analysis/maths/test_add.py index af2c7eb330..24569c2bfd 100644 --- a/lib/iris/tests/unit/analysis/maths/test_add.py +++ b/lib/iris/tests/unit/analysis/maths/test_add.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2015, Met Office +# (C) British Crown Copyright 2014 - 2016, Met Office # # This file is part of Iris. # @@ -30,6 +30,7 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin +@tests.skip_data class TestBroadcasting(tests.IrisTest, CubeArithmeticBroadcastingTestMixin): @property def data_op(self): diff --git a/lib/iris/tests/unit/analysis/maths/test_divide.py b/lib/iris/tests/unit/analysis/maths/test_divide.py index 7ada2cfc37..d577133af3 100644 --- a/lib/iris/tests/unit/analysis/maths/test_divide.py +++ b/lib/iris/tests/unit/analysis/maths/test_divide.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2015, Met Office +# (C) British Crown Copyright 2014 - 2016, Met Office # # This file is part of Iris. # @@ -32,6 +32,7 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin +@tests.skip_data class TestBroadcasting(tests.IrisTest, CubeArithmeticBroadcastingTestMixin): @property def data_op(self): diff --git a/lib/iris/tests/unit/analysis/maths/test_multiply.py b/lib/iris/tests/unit/analysis/maths/test_multiply.py index 5dbd089a09..8056796d72 100644 --- a/lib/iris/tests/unit/analysis/maths/test_multiply.py +++ b/lib/iris/tests/unit/analysis/maths/test_multiply.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2015, Met Office +# (C) British Crown Copyright 2014 - 2016, Met Office # # This file is part of Iris. # @@ -30,6 +30,7 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin +@tests.skip_data class TestBroadcasting(tests.IrisTest, CubeArithmeticBroadcastingTestMixin): @property def data_op(self): diff --git a/lib/iris/tests/unit/analysis/maths/test_subtract.py b/lib/iris/tests/unit/analysis/maths/test_subtract.py index 0b4e4a8568..95464c9af2 100644 --- a/lib/iris/tests/unit/analysis/maths/test_subtract.py +++ b/lib/iris/tests/unit/analysis/maths/test_subtract.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2014 - 2015, Met Office +# (C) British Crown Copyright 2014 - 2016, Met Office # # This file is part of Iris. # @@ -30,6 +30,7 @@ CubeArithmeticBroadcastingTestMixin, CubeArithmeticMaskingTestMixin +@tests.skip_data class TestBroadcasting(tests.IrisTest, CubeArithmeticBroadcastingTestMixin): @property def data_op(self): diff --git a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py index a307603bad..40607dfcdd 100644 --- a/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py +++ b/lib/iris/tests/unit/analysis/regrid/test_RectilinearRegridder.py @@ -1188,6 +1188,7 @@ def test_grid_subset_missing_data_aux(self): self.assertCMLApproxData(result, cml) +@tests.skip_data class Test___call____NOP(tests.IrisTest): def setUp(self): # The destination grid points are exactly the same as the diff --git a/lib/iris/tests/unit/cube/test_Cube.py b/lib/iris/tests/unit/cube/test_Cube.py index 4b51bc53b0..eefbac6ad4 100644 --- a/lib/iris/tests/unit/cube/test_Cube.py +++ b/lib/iris/tests/unit/cube/test_Cube.py @@ -409,6 +409,7 @@ def test_kwargs(self): self.assertMaskedArrayEqual(expected_result, res_cube.data) +@tests.skip_data class Test_slices_over(tests.IrisTest): def setUp(self): self.cube = stock.realistic_4d() diff --git a/lib/iris/tests/unit/fileformats/test_rules.py b/lib/iris/tests/unit/fileformats/test_rules.py index b815b0fece..3aa73f05b0 100644 --- a/lib/iris/tests/unit/fileformats/test_rules.py +++ b/lib/iris/tests/unit/fileformats/test_rules.py @@ -78,6 +78,7 @@ def transform(cube): dest.long_name = src.long_name self.assertEqual(dest, src) + @tests.skip_data def test_multiple_cubes_no_transform(self): target = ConcreteReferenceTarget('foo') src = stock.realistic_4d() @@ -87,6 +88,7 @@ def test_multiple_cubes_no_transform(self): self.assertIsNot(dest, src) self.assertEqual(dest, src) + @tests.skip_data def test_multiple_cubes_with_transform(self): def transform(cube): return {'long_name': 'wibble'} @@ -152,6 +154,7 @@ def converter(field): self.assertTrue(hasattr(aux_factory, 'fake_args')) self.assertEqual(aux_factory.fake_args, ({'name': 'foo'},)) + @tests.skip_data def test_cross_reference(self): # Test the creation process for a factory definition which uses # a cross-reference. diff --git a/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py b/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py index 02e06c3aa7..a840b5c419 100644 --- a/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py +++ b/lib/iris/tests/unit/util/test_demote_dim_coord_to_aux_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -38,6 +38,7 @@ def test_argument_is_basestring(self): self.assertEqual(cube_b.dim_coords, (cube_a.coord('latitude'), cube_a.coord('longitude'))) + @tests.skip_data def test_argument_is_coord_instance(self): cube_a = stock.realistic_4d() cube_b = cube_a.copy() diff --git a/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py b/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py index 7b72bbf6a9..d66dc792c5 100644 --- a/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py +++ b/lib/iris/tests/unit/util/test_promote_aux_coord_to_dim_coord.py @@ -1,4 +1,4 @@ -# (C) British Crown Copyright 2010 - 2015, Met Office +# (C) British Crown Copyright 2010 - 2016, Met Office # # This file is part of Iris. # @@ -44,6 +44,7 @@ def test_old_dim_coord_is_now_aux_coord(self): promote_aux_coord_to_dim_coord(cube_b, 'model_level_number') self.assertTrue(cube_a.coord('level_height') in cube_b.aux_coords) + @tests.skip_data def test_argument_is_coord_instance(self): cube_a = stock.realistic_4d() cube_b = cube_a.copy() @@ -53,6 +54,7 @@ def test_argument_is_coord_instance(self): cube_a.coord('grid_latitude'), cube_a.coord('grid_longitude'))) + @tests.skip_data def test_dimension_is_anonymous(self): cube_a = stock.realistic_4d() cube_b = cube_a.copy()