Fix more tests for always-on ugrid loading.

SciTools · Jul 19, 2024 · ce621f8 · ce621f8
1 parent 6be67d1
commit ce621f8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 13 deletions.
diff --git a/lib/iris/tests/integration/test_regridding.py b/lib/iris/tests/integration/test_regridding.py
@@ -98,7 +98,7 @@ def test_nearest(self):
 class TestUnstructured(tests.IrisTest):
     def setUp(self):
         path = tests.get_data_path(
-            ("NetCDF", "unstructured_grid", "theta_nodal_xios.nc")
+            ("NetCDF", "unstructured_grid", "theta_nodal_not_ugrid.nc")
         )
         self.src = iris.load_cube(path, "Potential Temperature")
         self.grid = simple_3d()[0, :, :]

diff --git a/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py b/lib/iris/tests/unit/experimental/ugrid/load/test_load_meshes.py
@@ -168,13 +168,6 @@ def test_var_name(self):
         self.assertEqual(1, len(file_meshes))
         self.assertEqual(second_name, file_meshes[0].var_name)
 
-    def test_no_parsing(self):
-        nc_path = cdl_to_nc(self.ref_cdl)
-        with self.assertRaisesRegex(
-            ValueError, ".*Must be True to enable mesh loading."
-        ):
-            _ = load_meshes(nc_path)
-
     def test_invalid_scheme(self):
         with self.assertRaisesRegex(ValueError, "Iris cannot handle the URI scheme:.*"):
             _ = load_meshes("foo://bar")

diff --git a/lib/iris/tests/unit/fileformats/netcdf/loader/test_load_cubes.py b/lib/iris/tests/unit/fileformats/netcdf/loader/test_load_cubes.py
@@ -263,11 +263,6 @@ def setUpClass(cls):
         cls.nc_path = cdl_to_nc(cls.ref_cdl)
         cls.mesh_cubes = list(load_cubes(cls.nc_path))
 
-    def test_mesh_handled(self):
-        cubes_no_ugrid = list(load_cubes(self.nc_path))
-        self.assertEqual(4, len(cubes_no_ugrid))
-        self.assertEqual(2, len(self.mesh_cubes))
-
     def test_standard_dims(self):
         for cube in self.mesh_cubes:
             self.assertIsNotNone(cube.coords("levels"))