Make test_analysis PyTest (#5859)

* Fixes to _shared_utils. * Make test_analysis.py pytest. * Make test_analysis_calculus.py pytest. * Remove np.testing.
SciTools · Mar 19, 2024 · 04002bb · 04002bb
1 parent b19650d
commit 04002bb
Show file tree

Hide file tree

Showing 3 changed files with 518 additions and 385 deletions.
diff --git a/lib/iris/tests/_shared_utils.py b/lib/iris/tests/_shared_utils.py
@@ -311,7 +311,7 @@ def assert_CML_approx_data(
             fname[-1] = fname[-1][:-4]
         fname[-1] += ".data.%d.json" % i
         assert_data_almost_equal(cube.data, fname, **kwargs)
-    assert_CML(cubes, reference_filename, checksum=False)
+    assert_CML(request, cubes, reference_filename, checksum=False)
 
 
 def assert_CDL(
@@ -459,8 +459,8 @@ def assert_data_almost_equal(data, reference_filename, **kwargs):
         kwargs.setdefault("err_msg", "Reference file %s" % reference_path)
         with open(reference_path, "r") as reference_file:
             stats = json.load(reference_file)
-            assert stats.get("shape", []), list(data.shape)
-            assert stats.get("masked", False), ma.is_masked(data)
+            assert stats.get("shape", []) == list(data.shape)
+            assert stats.get("masked", False) == ma.is_masked(data)
             nstats = np.array(
                 (
                     stats.get("mean", 0.0),