fix tests and lockfile

stephenworsley · Feb 27, 2025 · f5ddd88 · f5ddd88
1 parent 79ab1b4
commit f5ddd88
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 95 deletions.
diff --git a/lib/iris/tests/__init__.py b/lib/iris/tests/__init__.py
@@ -86,6 +86,7 @@
 
 #: Basepath for test results.
 _RESULT_PATH = os.path.join(os.path.dirname(__file__), "results")
+MIN_PICKLE_PROTOCOL = 4
 
 if "--data-files-used" in sys.argv:
     sys.argv.remove("--data-files-used")

diff --git a/lib/iris/tests/integration/test_pickle.py b/lib/iris/tests/integration/test_pickle.py
@@ -7,14 +7,14 @@
 # Import iris.tests first so that some things can be initialised before
 # importing anything else.
 import iris.tests as tests  # isort:skip
+from iris.tests import MIN_PICKLE_PROTOCOL
 
 import pickle
 
 import pytest
 
 import iris
 
-MIN_PICKLE_PROTOCOL = 4
 TESTED_PROTOCOLS = list(range(MIN_PICKLE_PROTOCOL, pickle.HIGHEST_PROTOCOL + 1))
 
 

diff --git a/lib/iris/tests/test_pickling.py b/lib/iris/tests/test_pickling.py
@@ -7,6 +7,7 @@
 # Import iris tests first so that some things can be initialised
 # before importing anything else.
 import iris.tests as tests  # isort:skip
+from iris.tests import MIN_PICKLE_PROTOCOL
 
 import io
 import pickle
@@ -21,7 +22,7 @@
 class TestPickle(tests.IrisTest):
     def pickle_then_unpickle(self, obj):
         """Returns a generator of ("pickle protocol number", object) tuples."""
-        for protocol in range(1 + pickle.HIGHEST_PROTOCOL):
+        for protocol in range(MIN_PICKLE_PROTOCOL, pickle.HIGHEST_PROTOCOL + 1):
             bio = io.BytesIO()
             pickle.dump(obj, bio, protocol)
 

diff --git a/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py b/lib/iris/tests/unit/fileformats/pp/test__interpret_field.py
@@ -117,9 +117,9 @@ def test_landsea_unpacking_uses_dask(self):
         # Get the 'main' calculation entry.
         mask_toplev_item = lazy_mask_array.dask[mask_toplev_key]
         # This should be a task (a simple fetch).
-        self.assertTrue(callable(mask_toplev_item[0]))
+        self.assertTrue(callable(mask_toplev_item))
         # Get the key (name) of the array that it fetches.
-        mask_data_name = mask_toplev_item[1]
+        mask_data_name = mask_toplev_item.args[0].key
 
         # Check that the item this refers to is a PPDataProxy.
         self.assertIsInstance(lazy_mask_array.dask[mask_data_name], pp.PPDataProxy)