From 5fbd7be550c4b646e1e6cd5142e2cbff64c0dc2d Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Fri, 15 Mar 2024 13:19:50 +0000
Subject: [PATCH 1/3] pytest migration for unit.common.lenient.test__qualname

---
 .../unit/common/lenient/test__qualname.py     | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/lib/iris/tests/unit/common/lenient/test__qualname.py b/lib/iris/tests/unit/common/lenient/test__qualname.py
index 49576814d4..69d2d229e1 100644
--- a/lib/iris/tests/unit/common/lenient/test__qualname.py
+++ b/lib/iris/tests/unit/common/lenient/test__qualname.py
@@ -4,25 +4,23 @@
 # See LICENSE in the root of the repository for full licensing details.
 """Unit tests for the :func:`iris.common.lenient._qualname`."""
 
-# Import iris.tests first so that some things can be initialised before
-# importing anything else.
-import iris.tests as tests  # isort:skip
-
 from inspect import getmodule
-from unittest.mock import sentinel
+
+import pytest
 
 from iris.common.lenient import _qualname
 
 
-class Test(tests.IrisTest):
-    def setUp(self):
+class Test:
+    @pytest.fixture(autouse=True)
+    def _setup(self):
         module_name = getmodule(self).__name__
         self.locals = f"{module_name}" + ".Test.{}.<locals>.{}"
 
-    def test_pass_thru_non_callable(self):
-        func = sentinel.func
+    def test_pass_thru_non_callable(self, mocker):
+        func = mocker.sentinel.func
         result = _qualname(func)
-        self.assertEqual(result, func)
+        assert result == func
 
     def test_callable_function_local(self):
         def myfunc():
@@ -30,13 +28,13 @@ def myfunc():
 
         qualname_func = self.locals.format("test_callable_function_local", "myfunc")
         result = _qualname(myfunc)
-        self.assertEqual(result, qualname_func)
+        assert result == qualname_func
 
     def test_callable_function(self):
         import iris
 
         result = _qualname(iris.load)
-        self.assertEqual(result, "iris.load")
+        assert result == "iris.load"
 
     def test_callable_method_local(self):
         class MyClass:
@@ -47,14 +45,10 @@ def mymethod(self):
             "test_callable_method_local", "MyClass.mymethod"
         )
         result = _qualname(MyClass.mymethod)
-        self.assertEqual(result, qualname_method)
+        assert result == qualname_method
 
     def test_callable_method(self):
         import iris
 
         result = _qualname(iris.cube.Cube.add_ancillary_variable)
-        self.assertEqual(result, "iris.cube.Cube.add_ancillary_variable")
-
-
-if __name__ == "__main__":
-    tests.main()
+        assert result == "iris.cube.Cube.add_ancillary_variable"

From dda25a3e3ef74b6a2ab69c7189fe08759394870e Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Mon, 18 Mar 2024 11:12:11 +0000
Subject: [PATCH 2/3] use setup_method

---
 lib/iris/tests/unit/common/lenient/test__qualname.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/iris/tests/unit/common/lenient/test__qualname.py b/lib/iris/tests/unit/common/lenient/test__qualname.py
index 69d2d229e1..d47e303e94 100644
--- a/lib/iris/tests/unit/common/lenient/test__qualname.py
+++ b/lib/iris/tests/unit/common/lenient/test__qualname.py
@@ -6,14 +6,11 @@
 
 from inspect import getmodule
 
-import pytest
-
 from iris.common.lenient import _qualname
 
 
 class Test:
-    @pytest.fixture(autouse=True)
-    def _setup(self):
+    def setup_method(self):
         module_name = getmodule(self).__name__
         self.locals = f"{module_name}" + ".Test.{}.<locals>.{}"
 

From dc45b6cf7e7252e1249c935592959331dd7859d1 Mon Sep 17 00:00:00 2001
From: Bill Little <bill.james.little@gmail.com>
Date: Tue, 19 Mar 2024 10:33:42 +0000
Subject: [PATCH 3/3] use setup fixture

---
 lib/iris/tests/unit/common/lenient/test__qualname.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/iris/tests/unit/common/lenient/test__qualname.py b/lib/iris/tests/unit/common/lenient/test__qualname.py
index d47e303e94..69d2d229e1 100644
--- a/lib/iris/tests/unit/common/lenient/test__qualname.py
+++ b/lib/iris/tests/unit/common/lenient/test__qualname.py
@@ -6,11 +6,14 @@
 
 from inspect import getmodule
 
+import pytest
+
 from iris.common.lenient import _qualname
 
 
 class Test:
-    def setup_method(self):
+    @pytest.fixture(autouse=True)
+    def _setup(self):
         module_name = getmodule(self).__name__
         self.locals = f"{module_name}" + ".Test.{}.<locals>.{}"