Test fixes.

Author: pp-mo

lib/iris/fileformats/netcdf/saver.py

@@ -56,6 +56,7 @@
 import iris.fileformats.cf
 from iris.fileformats.netcdf import _bytecoding_datasets as bytecoding_datasets
 from iris.fileformats.netcdf import _dask_locks
+from iris.fileformats.netcdf import _thread_safe_nc as threadsafe_nc
 from iris.fileformats.netcdf._attribute_handlers import ATTRIBUTE_HANDLERS
 import iris.io
 import iris.util
@@ -2523,7 +2524,7 @@ def _increment_name(self, varname):
     def _lazy_stream_data(
         self,
         data: np.typing.ArrayLike,
-        cf_var: CFVariable,
+        cf_var: threadsafe_nc.VariableWrapper,
     ) -> None:
         if hasattr(data, "shape") and data.shape == (1,) + cf_var.shape:
             # (Don't do this check for string data).
@@ -2550,7 +2551,7 @@ def _lazy_stream_data(
                 # later by a call to delayed_completion().
                 def store(
                     data: np.typing.ArrayLike,
-                    cf_var: CFVariable,
+                    cf_var: threadsafe_nc.VariableWrapper,
                 ) -> None:
                     # Create a data-writeable object that we can stream into, which
                     # encapsulates the file to be opened + variable to be written.
@@ -2564,7 +2565,7 @@ def store(
                 # Real data is always written directly, i.e. not via lazy save.
                 def store(
                     data: np.typing.ArrayLike,
-                    cf_var: CFVariable,
+                    cf_var: threadsafe_nc.VariableWrapper,
                 ) -> None:
                     cf_var[:] = data  # type: ignore[index]
 

lib/iris/tests/unit/fileformats/netcdf/saver/test_Saver__lazy_stream_data.py

@@ -16,6 +16,7 @@
 import numpy as np
 import pytest
 
+import iris.fileformats.netcdf._bytecoding_datasets as bytecoding_datasets
 import iris.fileformats.netcdf._thread_safe_nc as threadsafe_nc
 from iris.fileformats.netcdf.saver import Saver
 
@@ -52,9 +53,10 @@ def data_form(request) -> Iterator[bool]:
         return request.param
 
     @staticmethod
-    def saver(compute) -> Saver:
+    def saver(compute, data_form, tmp_path) -> Saver:
         # Create a test Saver object
-        return Saver(filename="<dummy>", netcdf_format="NETCDF4", compute=compute)
+        filepath = tmp_path / f"tmp_{compute}_{data_form}.nc"
+        return Saver(filename=filepath, netcdf_format="NETCDF4", compute=compute)
 
     @staticmethod
     def mock_var(shape, with_data_array, mocker):
@@ -68,6 +70,7 @@ def mock_var(shape, with_data_array, mocker):
             spec=threadsafe_nc.VariableWrapper,
             shape=tuple(shape),
             dtype=np.dtype(np.float32),
+            _contained_instance=mocker.Mock(dtype="f4"),
             **extra_properties,
         )
         # Give the mock cf-var a name property, as required by '_lazy_stream_data'.
@@ -76,9 +79,9 @@ def mock_var(shape, with_data_array, mocker):
         mock_cfvar.name = "<mock_cfvar>"
         return mock_cfvar
 
-    def test_data_save(self, compute, data_form, mocker):
+    def test_data_save(self, compute, data_form, mocker, tmp_path):
         """Real data is transferred immediately, lazy data creates a delayed write."""
-        saver = self.saver(compute=compute)
+        saver = self.saver(compute, data_form, tmp_path)
 
         data = np.arange(5.0)
         if data_form == "lazydata":