From afd40306504dcb21ec0dfa1b002b76a6ac2ab595 Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Mon, 24 Nov 2025 10:40:27 +0000 Subject: [PATCH 1/2] Converted test_fieldsfile to pytest --- .../tests/integration/um/test_fieldsfile.py | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/lib/iris/tests/integration/um/test_fieldsfile.py b/lib/iris/tests/integration/um/test_fieldsfile.py index 969a343c4f..01c20e6b1f 100644 --- a/lib/iris/tests/integration/um/test_fieldsfile.py +++ b/lib/iris/tests/integration/um/test_fieldsfile.py @@ -4,35 +4,32 @@ # See LICENSE in the root of the repository for full licensing details. """Test the fast loading of structured Fieldsfiles.""" -# import iris tests first so that some things can be initialised before -# importing anything else -import iris.tests as tests # isort:skip +import pytest + from iris.cube import CubeList from iris.fileformats.um import load_cubes as load +from iris.tests import _shared_utils -@tests.skip_data -class TestStructuredLoadFF(tests.IrisTest): - def setUp(self): - self.fname = tests.get_data_path(("FF", "structured", "small")) +@_shared_utils.skip_data +class TestStructuredLoadFF: + @pytest.fixture(autouse=True) + def _setup(self): + self.fname = _shared_utils.get_data_path(("FF", "structured", "small")) def _merge_cubes(self, cubes): # Merge the 2D cubes returned by `iris.fileformats.um.load_cubes`. return CubeList(cubes).merge_cube() - def test_simple(self): + def test_simple(self, request): list_of_cubes = list(load(self.fname, None)) cube = self._merge_cubes(list_of_cubes) - self.assertCML(cube) + _shared_utils.assert_CML(request, cube) - def test_simple_callback(self): + def test_simple_callback(self, request): def callback(cube, field, filename): cube.attributes["processing"] = "fast-ff" list_of_cubes = list(load(self.fname, callback=callback)) cube = self._merge_cubes(list_of_cubes) - self.assertCML(cube) - - -if __name__ == "__main__": - tests.main() + _shared_utils.assert_CML(request, cube) From b38b30129740ea7cd2df372c0d934b18b7450f0f Mon Sep 17 00:00:00 2001 From: Elias Sadek Date: Wed, 26 Nov 2025 13:43:46 +0000 Subject: [PATCH 2/2] added cml --- .../um/fieldsfile/StructuredLoadFF/simple.cml | 50 ++++++++++++++++++ .../StructuredLoadFF/simple_callback.cml | 51 +++++++++++++++++++ 2 files changed, 101 insertions(+) create mode 100644 lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple.cml create mode 100644 lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple_callback.cml diff --git a/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple.cml b/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple.cml new file mode 100644 index 0000000000..d9a7d71999 --- /dev/null +++ b/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple.cml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple_callback.cml b/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple_callback.cml new file mode 100644 index 0000000000..bd9249f4b8 --- /dev/null +++ b/lib/iris/tests/results/integration/um/fieldsfile/StructuredLoadFF/simple_callback.cml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +