python/tests/ 100% coverage of tests.

 * python/tests/conftest.py (immutable_call): Remove unused freeze argument.
 * python/tests/test_immutability.py: Make sure all paths are tested.
 * python/tests/test_moocore.py (test_read_datasets_data): expected_name cannot be empty.

Author: MLopez-Ibanez

python/tests/conftest.py

@@ -23,10 +23,10 @@ def immutable_call():
     Call a function and assert that selected arguments remain immutable.
 
     Usage:
-        immutable_call(fn, *args, **kwargs, immutable=[0, "y"], freeze=True)
+        immutable_call(fn, *args, **kwargs, immutable=[0, "y"])
     """
 
-    def _call(fn, *args, immutable=None, freeze=True, **kwargs):
+    def _call(fn, *args, immutable=None, **kwargs):
         # If immutable is None, then all positional and keyword args are
         # immutable.
         if immutable is None:
@@ -37,14 +37,13 @@ def _call(fn, *args, immutable=None, freeze=True, **kwargs):
         args_copy = [deep_copy(a) for a in args]
         kwargs_copy = {k: deep_copy(v) for k, v in kwargs.items()}
 
-        # Freeze mutable args if needed
-        if freeze:
-            for idx, a in enumerate(args):
-                if idx in immutable:
-                    freeze_numpy(a)
-            for k, v in kwargs.items():
-                if k in immutable:
-                    freeze_numpy(v)
+        # Freeze mutable args.
+        for idx, a in enumerate(args):
+            if idx in immutable:
+                freeze_numpy(a)
+        for k, v in kwargs.items():
+            if k in immutable:
+                freeze_numpy(v)
 
         # Run the function — any exception is a failure
         try:

python/tests/test_immutability.py

@@ -19,20 +19,20 @@ def test_partial_immutability_positional(immutable_call):
     """Check partial immutable_call works."""
 
     def bad(x, y):
-        x[0] = 99  # SHOULD be caught
+        y[0] = 99  # SHOULD be caught
         return x.sum() + y.sum()  # nocov
 
     def good(x, y):
-        y[0] = 88  # allowed
+        x[0] = 88  # allowed
         return x.sum() + y.sum()
 
     x = np.array([1, 2, 3])
     y = np.array([5, 6, 7])
 
     with pytest.raises(AssertionError):
-        immutable_call(bad, x, y, immutable=[0])  # x must remain immutable
+        immutable_call(bad, x, y, immutable=[1])  # x must remain immutable
 
-    immutable_call(good, x, y, immutable=[0])  # x must remain immutable
+    immutable_call(good, x, y, immutable=[1])  # x must remain immutable
 
 
 def test_partial_immutability_keyword(immutable_call):
@@ -50,9 +50,9 @@ def good(a, b):
     b = np.array([3, 4])
 
     with pytest.raises(AssertionError):
-        immutable_call(bad, a, b=b, immutable=["b"])
+        immutable_call(bad, a=a, b=b, immutable=["b"])
 
-    immutable_call(good, a, b=b, immutable=["b"])
+    immutable_call(good, a=a, b=b, immutable=["b"])
 
 
 def test_nested_structures(immutable_call):

python/tests/test_moocore.py

@@ -39,10 +39,9 @@ def test_read_datasets_data(test_datapath, test, expected_name, expected_shape):
     assert testdata.shape == expected_shape, (
         f"Read data array has incorrect shape, should be {expected_shape} but is {testdata.shape}"
     )
-    if expected_name != "":
-        check_data = np.loadtxt(
-            test_datapath("expected_output/read_datasets/" + expected_name)
-        )
+    check_data = np.loadtxt(
+        test_datapath("expected_output/read_datasets/" + expected_name)
+    )
     assert_allclose(
         testdata,
         check_data,