From 2427de8a3b93c22fa95ee4b5c1a67b42e2f8a560 Mon Sep 17 00:00:00 2001
From: Patrick Peglar <patrick.peglar@metoffice.gov.uk>
Date: Mon, 11 Mar 2024 16:42:47 +0000
Subject: [PATCH] Everything in 'TestConcatenate__dask' can use the same sample
 cubes.

---
 .../unit/concatenate/test_concatenate.py      | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/lib/iris/tests/unit/concatenate/test_concatenate.py b/lib/iris/tests/unit/concatenate/test_concatenate.py
index 0037a39cd3a..2045c376ce3 100644
--- a/lib/iris/tests/unit/concatenate/test_concatenate.py
+++ b/lib/iris/tests/unit/concatenate/test_concatenate.py
@@ -324,23 +324,22 @@ def test_desc_bounds_all_singleton(self):
 
 
 class TestConcatenate__dask:
-    @staticmethod
-    def build_lazy_cube(points):
-        nx = 4
-        data = np.arange(len(points) * nx).reshape(len(points), nx)
-        data = as_lazy_data(data)
-        cube = iris.cube.Cube(data, standard_name="air_temperature", units="K")
-        lat = iris.coords.DimCoord(points, "latitude")
-        lon = iris.coords.DimCoord(np.arange(nx), "longitude")
-        cube.add_dim_coord(lat, 0)
-        cube.add_dim_coord(lon, 1)
-        return cube
-
     @pytest.fixture()
     def sample_lazy_cubes(self):
         # Make a pair of concatenatable cubes, with dim points [1, 2] and [3, 4, 5]
-        c1 = self.build_lazy_cube([1, 2])
-        c2 = self.build_lazy_cube([3, 4, 5])
+        def build_lazy_cube(points):
+            nx = 4
+            data = np.arange(len(points) * nx).reshape(len(points), nx)
+            data = as_lazy_data(data)
+            cube = iris.cube.Cube(data, standard_name="air_temperature", units="K")
+            lat = iris.coords.DimCoord(points, "latitude")
+            lon = iris.coords.DimCoord(np.arange(nx), "longitude")
+            cube.add_dim_coord(lat, 0)
+            cube.add_dim_coord(lon, 1)
+            return cube
+
+        c1 = build_lazy_cube([1, 2])
+        c2 = build_lazy_cube([3, 4, 5])
         return c1, c2
 
     @staticmethod
@@ -363,7 +362,6 @@ def test_lazy_concatenate(self, sample_lazy_cubes):
 
     def test_lazy_concatenate_aux_coords(self, sample_lazy_cubes):
         c1, c2 = sample_lazy_cubes
-        c2 = self.build_lazy_cube([3, 4, 5])
         for cube in (c1, c2):
             self.add_sample_auxcoord(cube)
         (result,) = concatenate([c1, c2])