From 0f9117efaa811494135983f732bf55266d4b4ccb Mon Sep 17 00:00:00 2001
From: "Michael R. Crusoe" <crusoe@debian.org>
Date: Wed, 7 Jun 2023 16:50:06 +0100
Subject: [PATCH] test_catories path fixes

---
 tests/test_categories.py | 37 +++++++++++++++----------------------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/tests/test_categories.py b/tests/test_categories.py
index c6461e9..ceb2f3b 100644
--- a/tests/test_categories.py
+++ b/tests/test_categories.py
@@ -14,15 +14,10 @@
 
 def test_unsupported_with_required_tests() -> None:
     cwl_runner = get_data("tests/test-data/mock_cwl_runner.py")
-    args = [
-        "--test",
-        schema_salad.ref_resolver.file_uri(
-            get_data("tests/test-data/required-unsupported.yml")
-        ),
-    ]
     cwd = os.getcwd()
+    os.chdir(get_data("tests/test-data/"))
+    args = ["--test", "required-unsupported.yml"]
     try:
-        os.chdir(get_data("tests/test-data/"))
         error_code, stdout, stderr = run_with_mock_cwl_runner(args)
     finally:
         os.chdir(cwd)
@@ -35,21 +30,19 @@ def test_unsupported_with_required_tests() -> None:
     else:
         q = ""
     assert (
-        "The `id` field is missing.{n}"
-        "The `id` field is missing.{n}"
-        "Test [1/2] Required test that is unsupported (without tags){n}"
-        "{n}"
-        "Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-        "Required test that is unsupported (without tags){n}"
-        "Does not support required feature{n}"
-        "Test [2/2] Required test that is unsupported (with tags){n}"
-        "{n}"
-        "Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
-        "Required test that is unsupported (with tags){n}"
-        "Does not support required feature{n}"
-        "0 tests passed, 2 failures, 0 unsupported features{n}".format(
-            cwl_runner=cwl_runner, n=n, p=p, q=q
-        )
+        f"The `id` field is missing.{n}"
+        f"The `id` field is missing.{n}"
+        f"Test [1/2] Required test that is unsupported (without tags){n}"
+        f"{n}"
+        f"Test 1 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
+        f"Required test that is unsupported (without tags){n}"
+        f"Does not support required feature{n}"
+        f"Test [2/2] Required test that is unsupported (with tags){n}"
+        f"{n}"
+        f"Test 2 failed: {cwl_runner} --quiet return-unsupported.cwl {q}v1.0{p}cat-job.json{q}{n}"
+        f"Required test that is unsupported (with tags){n}"
+        f"Does not support required feature{n}"
+        f"0 tests passed, 2 failures, 0 unsupported features{n}"
     ) == stderr