modernize tests

Author: mr-c

cwltest/tests/test_argparse.py

@@ -1,20 +1,13 @@
-import unittest
 from cwltest import arg_parser
 
 
-class TestArgparse(unittest.TestCase):
-    def setUp(self):
-        self.parser = arg_parser()
-
-    def test_arg(self):
-        parsed = self.parser.parse_args(
-            ["--test", "test_name", "-n", "52", "--tool", "cwltool", "-j", "4"]
-        )
-        self.assertEqual(parsed.test, "test_name")
-        self.assertEqual(parsed.n, "52")
-        self.assertEqual(parsed.tool, "cwltool")
-        self.assertEqual(parsed.j, 4)
-
-
-if __name__ == "__main__":
-    unittest.main()
+def test_arg():
+    """Basic test of the argparse."""
+    parser = arg_parser()
+    parsed = parser.parse_args(
+        ["--test", "test_name", "-n", "52", "--tool", "cwltool", "-j", "4"]
+    )
+    assert parsed.test == "test_name"
+    assert parsed.n == "52"
+    assert parsed.tool == "cwltool"
+    assert parsed.j == 4

cwltest/tests/test_categories.py

@@ -1,97 +1,92 @@
-import unittest
 import re
 import os
 from os import linesep as n
 from os import sep as p
+from pathlib import Path
 
 from .util import run_with_mock_cwl_runner, get_data
 import defusedxml.ElementTree as ET
 import schema_salad.ref_resolver
 
 
-class TestCategories(unittest.TestCase):
-    maxDiff = None
+def test_unsupported_with_required_tests():
+    args = [
+        "--test",
+        schema_salad.ref_resolver.file_uri(
+            get_data("tests/test-data/required-unsupported.yml")
+        ),
+    ]
+    try:
+        cwd = os.getcwd()
+        os.chdir(get_data("tests/test-data/"))
+        error_code, stdout, stderr = run_with_mock_cwl_runner(args)
+    finally:
+        os.chdir(cwd)
 
-    def test_unsupported_with_required_tests(self):
-        args = [
-            "--test",
-            schema_salad.ref_resolver.file_uri(
-                get_data("tests/test-data/required-unsupported.yml")
-            ),
-        ]
-        try:
-            cwd = os.getcwd()
-            os.chdir(get_data("tests/test-data/"))
-            error_code, stdout, stderr = run_with_mock_cwl_runner(args)
-        finally:
-            os.chdir(cwd)
+    assert error_code == 1
+    print(stderr)
+    stderr = re.sub(r" '?--outdir=[^ ]*", "", stderr)
+    if os.name == "nt":
+        q = "'"
+    else:
+        q = ""
+    assert (
+        "Test [1/2] Required test that is unsupported (without tags){n}"
+        "{n}"
+        "Test 1 failed: mock-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}"
+        "{n}"
+        "Test [2/2] Required test that is unsupported (with tags){n}"
+        "{n}"
+        "Test 2 failed: mock-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}"
+        "{n}"
+        "0 tests passed, 2 failures, 0 unsupported features{n}".format(n=n, p=p, q=q)
+    ) == stderr
 
-        self.assertEqual(error_code, 1)
-        print(stderr)
-        stderr = re.sub(r" '?--outdir=[^ ]*", "", stderr)
-        if os.name == "nt":
-            q = "'"
-        else:
-            q = ""
-        self.assertEqual(
-            "Test [1/2] Required test that is unsupported (without tags){n}"
-            "{n}"
-            "Test 1 failed: mock-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}"
-            "{n}"
-            "Test [2/2] Required test that is unsupported (with tags){n}"
-            "{n}"
-            "Test 2 failed: mock-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}"
-            "{n}"
-            "0 tests passed, 2 failures, 0 unsupported features{n}".format(
-                n=n, p=p, q=q
-            ),
-            stderr,
-        )
 
-    def test_unsupported_with_optional_tests(self):
-        args = [
-            "--test",
-            schema_salad.ref_resolver.file_uri(
-                get_data("tests/test-data/optional-unsupported.yml")
-            ),
-        ]
-        error_code, stdout, stderr = run_with_mock_cwl_runner(args)
-        self.assertEqual(error_code, 0)
-        self.assertEqual(
-            "Test [1/1] Optional test that is unsupported{n}{n}"
-            "0 tests passed, 1 unsupported "
-            "features{n}".format(n=n),
-            stderr,
-        )
+def test_unsupported_with_optional_tests():
+    args = [
+        "--test",
+        schema_salad.ref_resolver.file_uri(
+            get_data("tests/test-data/optional-unsupported.yml")
+        ),
+    ]
+    error_code, stdout, stderr = run_with_mock_cwl_runner(args)
+    assert error_code == 0
+    assert (
+        "Test [1/1] Optional test that is unsupported{n}{n}"
+        "0 tests passed, 1 unsupported "
+        "features{n}".format(n=n)
+    ) == stderr
+
+
+def test_error_with_optional_tests():
+    args = [
+        "--test",
+        schema_salad.ref_resolver.file_uri(
+            get_data("tests/test-data/optional-error.yml")
+        ),
+    ]
+    error_code, stdout, stderr = run_with_mock_cwl_runner(args)
+    assert error_code == 1
+    assert "1 failures" in stderr
 
-    def test_error_with_optional_tests(self):
-        args = [
-            "--test",
-            schema_salad.ref_resolver.file_uri(
-                get_data("tests/test-data/optional-error.yml")
-            ),
-        ]
-        error_code, stdout, stderr = run_with_mock_cwl_runner(args)
-        self.assertEqual(error_code, 1)
-        self.assertIn("1 failures", stderr)
 
-    def test_category_in_junit_xml(self):
-        junit_xml_report = get_data("tests/test-data/junit-report.xml")
-        args = [
-            "--test",
-            schema_salad.ref_resolver.file_uri(
-                get_data("tests/test-data/optional-error.yml")
-            ),
-            "--junit-xml",
-            junit_xml_report,
-        ]
-        run_with_mock_cwl_runner(args)
-        tree = ET.parse(junit_xml_report)
-        root = tree.getroot()
-        category = root.find("testsuite").find("testcase").attrib["class"]
-        self.assertEqual(category, "js, init_work_dir")
-        os.remove(junit_xml_report)
+def test_category_in_junit_xml(tmp_path: Path):
+    junit_xml_report = tmp_path / "junit-report.xml"
+    args = [
+        "--test",
+        schema_salad.ref_resolver.file_uri(
+            get_data("tests/test-data/optional-error.yml")
+        ),
+        "--junit-xml",
+        str(junit_xml_report),
+    ]
+    run_with_mock_cwl_runner(args)
+    tree = ET.parse(junit_xml_report)
+    root = tree.getroot()
+    category = root.find("testsuite").find("testcase").attrib["class"]
+    assert category == "js, init_work_dir"

cwltest/tests/test_compare.py

@@ -1,64 +1,63 @@
-import unittest
 from .util import get_data
 from cwltest import CompareFail
 from cwltest.utils import compare_file, compare
 
+import pytest
 
-class TestCompareFile(unittest.TestCase):
-    def test_compare_file(self):
-        expected = {
-            "location": "cores.txt",
-            "size": 2,
-            "class": "File",
-            "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
-        }
 
-        actual = {
-            "basename": "cores.txt",
-            "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
-            "class": "File",
-            "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "path": "/var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "size": 2,
-        }
-        try:
-            compare_file(expected, actual)
-        except CompareFail:
-            self.fail("File comparison failed unexpectedly")
+def test_compare_file():
+    expected = {
+        "location": "cores.txt",
+        "size": 2,
+        "class": "File",
+        "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
+    }
 
-    def test_compare_contents_success(self):
-        expected = {
-            "location": "cores.txt",
-            "size": 2,
-            "class": "File",
-            "contents": "2\n",
-        }
+    actual = {
+        "basename": "cores.txt",
+        "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
+        "class": "File",
+        "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
+        "path": "/var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
+        "size": 2,
+    }
+    compare_file(expected, actual)
 
-        actual = {
-            "basename": "cores.txt",
-            "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
-            "class": "File",
-            "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "path": get_data("tests/test-data/cores.txt"),
-            "size": 2,
-        }
-        compare(expected, actual)
 
-    def test_compare_contents_failure(self):
-        expected = {
-            "location": "cores.txt",
-            "size": 2,
-            "class": "File",
-            "contents": "2",
-        }
+def test_compare_contents_success():
+    expected = {
+        "location": "cores.txt",
+        "size": 2,
+        "class": "File",
+        "contents": "2\n",
+    }
 
-        actual = {
-            "basename": "cores.txt",
-            "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
-            "class": "File",
-            "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
-            "path": get_data("tests/test-data/cores.txt"),
-            "size": 2,
-        }
-        with self.assertRaises(CompareFail):
-            compare_file(expected, actual)
+    actual = {
+        "basename": "cores.txt",
+        "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
+        "class": "File",
+        "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
+        "path": get_data("tests/test-data/cores.txt"),
+        "size": 2,
+    }
+    compare(expected, actual)
+
+
+def test_compare_contents_failure():
+    expected = {
+        "location": "cores.txt",
+        "size": 2,
+        "class": "File",
+        "contents": "2",
+    }
+
+    actual = {
+        "basename": "cores.txt",
+        "checksum": "sha1$7448d8798a4380162d4b56f9b452e2f6f9e24e7a",
+        "class": "File",
+        "location": "file:///var/folders/8x/2df05_7j20j6r8y81w4qf43r0000gn/T/tmpG0EkrS/cores.txt",
+        "path": get_data("tests/test-data/cores.txt"),
+        "size": 2,
+    }
+    with pytest.raises(CompareFail):
+        compare_file(expected, actual)

cwltest/tests/test_prepare.py

@@ -1,29 +1,26 @@
+"""Test prepare_test_command()"""
 import os
-import unittest
 from cwltest import prepare_test_command
 
 
-class TestPrepareCommand(unittest.TestCase):
-    """Test prepare_test_command()"""
-
-    def test_unix_relative_path(self):
-        """Confirm unix style to windows style path corrections."""
-        command = prepare_test_command(
-            tool="cwl-runner",
-            args=[],
-            testargs=None,
-            test={
-                "doc": "General test of command line generation",
-                "output": {"args": ["echo"]},
-                "tool": "v1.0/bwa-mem-tool.cwl",
-                "job": "v1.0/bwa-mem-job.json",
-                "tags": ["required"],
-            },
-            cwd=os.getcwd(),
-        )
-        if os.name == "nt":
-            self.assertEqual(command[3], "v1.0\\bwa-mem-tool.cwl")
-            self.assertEqual(command[4], "v1.0\\bwa-mem-job.json")
-        else:
-            self.assertEqual(command[3], "v1.0/bwa-mem-tool.cwl")
-            self.assertEqual(command[4], "v1.0/bwa-mem-job.json")
+def test_unix_relative_path():
+    """Confirm unix style to windows style path corrections."""
+    command = prepare_test_command(
+        tool="cwl-runner",
+        args=[],
+        testargs=None,
+        test={
+            "doc": "General test of command line generation",
+            "output": {"args": ["echo"]},
+            "tool": "v1.0/bwa-mem-tool.cwl",
+            "job": "v1.0/bwa-mem-job.json",
+            "tags": ["required"],
+        },
+        cwd=os.getcwd(),
+    )
+    if os.name == "nt":
+        assert command[3] == "v1.0\\bwa-mem-tool.cwl"
+        assert command[4] == "v1.0\\bwa-mem-job.json"
+    else:
+        assert command[3] == "v1.0/bwa-mem-tool.cwl"
+        assert command[4] == "v1.0/bwa-mem-job.json"