Confine split-attrs usage.

Author: pp-mo

lib/iris/tests/integration/netcdf/test_load_managed_attributes.py

@@ -26,11 +26,6 @@
 from iris.warnings import IrisLoadWarning
 
 
-@pytest.fixture(autouse=True, scope="session")
-def iris_futures():
-    iris.FUTURE.save_split_attrs = True
-
-
 class LoadTestCommon:
     @pytest.fixture(autouse=True)
     def tmp_filepath(self, tmp_path_factory):
@@ -43,7 +38,9 @@ def _check_load_inner(self, iris_name, nc_name, value):
         # quickly create a valid netcdf file with a simple cube in it.
         cube = Cube([1], var_name="x")
         # Save : NB can fail
-        iris.save(cube, self.tmp_ncpath)
+        with iris.FUTURE.context(save_split_attrs=True):
+            iris.save(cube, self.tmp_ncpath)
+
         # Reopen for updating with netcdf
         ds = NcDataset(self.tmp_ncpath, "r+")
         # Add the test attribute content.

lib/iris/tests/integration/netcdf/test_save_managed_attributes.py

@@ -18,11 +18,6 @@
 from iris.fileformats.pp import STASH
 
 
-@pytest.fixture(autouse=True, scope="session")
-def iris_futures():
-    iris.FUTURE.save_split_attrs = True
-
-
 class SaveTestCommon:
     @pytest.fixture(autouse=True)
     def tmp_filepath(self, tmp_path_factory):
@@ -34,7 +29,9 @@ def tmp_filepath(self, tmp_path_factory):
     def _check_save_inner(self, iris_name, nc_name, value):
         cube = Cube([1], var_name="x", attributes={iris_name: value})
         # Save : NB can fail
-        iris.save(cube, self.tmp_ncpath)
+        with iris.FUTURE.context(save_split_attrs=True):
+            iris.save(cube, self.tmp_ncpath)
+
         ds = NcDataset(self.tmp_ncpath)
         result = ds.variables["x"].getncattr(nc_name)
         return result