improve test failure reporting

Author: mr-c

tests/test_examples.py

@@ -1181,8 +1181,7 @@ def test_cid_file_w_prefix(tmp_path: Path, factor: str) -> None:
             error_code, stdout, stderr = get_main_output(commands)
         finally:
             listing = tmp_path.iterdir()
-            cidfiles = tmp_path.glob("**/pytestcid*")
-            cidfiles_count = sum(1 for _ in cidfiles)
+            cidfiles_count = sum(1 for _ in tmp_path.glob("**/pytestcid*"))
     stderr = re.sub(r"\s\s+", " ", stderr)
     assert "completed success" in stderr
     assert error_code == 0

tests/test_iwdr.py

@@ -131,7 +131,9 @@ def test_iwdr_permutations(tmp_path_factory: Any) -> None:
     )
     assert err_code == 0
     log = json.loads(stdout)["log"]
-    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log
+    with open(log["path"]) as log_h:
+        log_text = log_h.read()
+    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log_text
 
 
 def test_iwdr_permutations_readonly(tmp_path_factory: Any) -> None:
@@ -240,7 +242,9 @@ def test_iwdr_permutations_inplace(tmp_path_factory: Any) -> None:
     )
     assert err_code == 0
     log = json.loads(stdout)["log"]
-    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log
+    with open(log["path"]) as log_h:
+        log_text = log_h.read()
+    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log_text
 
 
 @needs_singularity
@@ -298,7 +302,9 @@ def test_iwdr_permutations_singularity(tmp_path_factory: Any) -> None:
     )
     assert err_code == 0
     log = json.loads(stdout)["log"]
-    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log
+    with open(log["path"]) as log_h:
+        log_text = log_h.read()
+    assert log["checksum"] == "sha1$bc51ebb3f65ca44282789dd1e6de9747d8abe75f", log_text
 
 
 @needs_singularity

tests/test_udocker.py

@@ -50,16 +50,16 @@ def test_udocker_usage_should_not_write_cid_file(udocker: str, tmp_path: Path) -
     """Confirm that no cidfile is made when udocker is used."""
 
     with working_directory(tmp_path):
-        test_file = "tests/echo-position-expr.cwl"
-        job_file = "tests/echo-position-echo-position-expr-job.yml"
+        test_file = "tests/echo.cwl"
         error_code, stdout, stderr = get_main_output(
             [
                 "--debug",
                 "--default-container",
                 "debian:stable-slim",
                 "--user-space-docker-cmd=" + udocker,
                 get_data(test_file),
-                get_data(job_file),
+                "--inp",
+                "hello",
             ]
         )