maintenance: remove unittest from test_fetch

Author: psafont

tests/test_fetch.py

@@ -1,12 +1,12 @@
-from __future__ import absolute_import
-
 import os
-import unittest
+
+from six.moves import urllib
+
+import pytest
 
 import schema_salad.main
 import schema_salad.ref_resolver
 import schema_salad.schema
-from six.moves import urllib
 
 from cwltool.context import LoadingContext
 from cwltool.load_tool import load_tool
@@ -15,83 +15,66 @@
 from cwltool.utils import onWindows
 from cwltool.workflow import default_make_tool
 
-from .util import get_data
+from .util import get_data, working_directory
 
+def test_fetcher():
+    class TestFetcher(schema_salad.ref_resolver.Fetcher):
+        def __init__(self, a, b):
+            pass
 
-class FetcherTest(unittest.TestCase):
-    """Test using custom schema_salad.ref_resolver.Fetcher."""
-    def test_fetcher(self):
-        class TestFetcher(schema_salad.ref_resolver.Fetcher):
-            def __init__(self, a, b):
-                pass
-
-            def fetch_text(self, url):  # type: (unicode) -> unicode
-                if url == "baz:bar/foo.cwl":
-                    return """
+        def fetch_text(self, url):  # type: (unicode) -> unicode
+            if url == "baz:bar/foo.cwl":
+                return """
 cwlVersion: v1.0
 class: CommandLineTool
 baseCommand: echo
 inputs: []
 outputs: []
 """
-                else:
-                    raise RuntimeError("Not foo.cwl, was %s" % url)
-
-            def check_exists(self, url):  # type: (unicode) -> bool
-                if url == "baz:bar/foo.cwl":
-                    return True
-                else:
-                    return False
-
-            def urljoin(self, base, url):
-                    urlsp = urllib.parse.urlsplit(url)
-                    if urlsp.scheme:
-                        return url
-                    basesp = urllib.parse.urlsplit(base)
-
-                    if basesp.scheme == "keep":
-                        return base + "/" + url
-                    return urllib.parse.urljoin(base, url)
-
-        def test_resolver(d, a):
-            if a.startswith("baz:bar/"):
-                return a
-            else:
-                return "baz:bar/" + a
-
-        loadingContext = LoadingContext({"construct_tool_object": default_make_tool,
-                                         "resolver": test_resolver,
-                                         "fetcher_constructor": TestFetcher})
-
-        load_tool("foo.cwl", loadingContext)
-
-        self.assertEquals(0, main(["--print-pre", "--debug", "foo.cwl"], loadingContext=loadingContext))
-
-
-class ResolverTest(unittest.TestCase):
-    def test_resolve_local(self):
-        origpath = os.getcwd()
-        os.chdir(os.path.join(get_data("")))
-
-        def norm(uri):
-            if onWindows():
-                return uri.lower()
-            else:
-                return uri
-        try:
-            root = Path.cwd()
-            rooturi = root.as_uri()
-            self.assertEqual(norm(rooturi+"/tests/echo.cwl"),
-                    norm(resolve_local(None, os.path.join("tests",
-                        "echo.cwl"))))
-            self.assertEqual(norm(rooturi+"/tests/echo.cwl#main"),
-                    norm(resolve_local(None, os.path.join("tests",
-                        "echo.cwl")+"#main")))
-            self.assertEqual(norm(rooturi+"/tests/echo.cwl"),
-                    norm(resolve_local(None, str(root / "tests" /
-                        "echo.cwl"))))
-            self.assertEqual(norm(rooturi+"/tests/echo.cwl#main"),
-                    norm(resolve_local(None, str(root / "tests" /
-                        "echo.cwl")+"#main")))
-        finally:
-            os.chdir(origpath)
+            raise RuntimeError("Not foo.cwl, was %s" % url)
+
+        def check_exists(self, url):  # type: (unicode) -> bool
+            return  url == "baz:bar/foo.cwl"
+
+        def urljoin(self, base, url):
+            urlsp = urllib.parse.urlsplit(url)
+            if urlsp.scheme:
+                return url
+            basesp = urllib.parse.urlsplit(base)
+
+            if basesp.scheme == "keep":
+                return base + "/" + url
+            return urllib.parse.urljoin(base, url)
+
+    def test_resolver(d, a):
+        if a.startswith("baz:bar/"):
+            return a
+        return "baz:bar/" + a
+
+    loadingContext = LoadingContext({"construct_tool_object": default_make_tool,
+                                     "resolver": test_resolver,
+                                     "fetcher_constructor": TestFetcher})
+
+    load_tool("foo.cwl", loadingContext)
+
+    assert main(["--print-pre", "--debug", "foo.cwl"], loadingContext=loadingContext) == 0
+
+root = Path(os.path.join(get_data("")))
+
+path_fragments = [
+    (os.path.join("tests", "echo.cwl"), "/tests/echo.cwl"),
+    (os.path.join("tests", "echo.cwl") + "#main", "/tests/echo.cwl#main"),
+    (str(root / "tests" / "echo.cwl"), "/tests/echo.cwl"),
+    (str(root / "tests" / "echo.cwl") + "#main", "/tests/echo.cwl#main")
+]
+
+@pytest.mark.parametrize('path,expected_path', path_fragments)
+def test_resolve_local(path, expected_path):
+    def norm(uri):
+        if onWindows():
+            return uri.lower()
+        return uri
+
+    with working_directory(root):
+        expected = norm(root.as_uri() + expected_path)
+        assert norm(resolve_local(None, path)) == expected

tests/util.py

@@ -3,18 +3,20 @@
 import distutils.spawn  # pylint: disable=no-name-in-module,import-error
 import functools
 import os
+import contextlib
 from typing import Text
 
-import pytest
 from pkg_resources import (Requirement, ResolutionError,  # type: ignore
                            resource_filename)
+import pytest
 
 from cwltool.context import LoadingContext, RuntimeContext
 from cwltool.factory import Factory
 from cwltool.resolver import Path
 from cwltool.utils import onWindows, windows_default_container_id
 
 
+
 def get_windows_safe_factory(runtime_context=None,  # type: RuntimeContext
                              loading_context=None,  # type: LoadingContext
                              executor=None          # type: Any
@@ -28,12 +30,12 @@ def get_windows_safe_factory(runtime_context=None,  # type: RuntimeContext
         runtime_context.default_container = windows_default_container_id
     return Factory(executor, loading_context, runtime_context)
 
-def force_default_container(default_container_id, builder):
+def force_default_container(default_container_id, _):
     return default_container_id
 
 def get_data(filename):
-    filename = os.path.normpath(
-        filename)  # normalizing path depending on OS or else it will cause problem when joining path
+    # normalizing path depending on OS or else it will cause problem when joining path
+    filename = os.path.normpath(filename)
     filepath = None
     try:
         filepath = resource_filename(
@@ -57,3 +59,14 @@ def get_data(filename):
     onWindows() and not bool(distutils.spawn.find_executable('docker')),
     reason="Running this test on MS Windows requires the docker executable "
     "on the system path.")
+
+@contextlib.contextmanager
+def working_directory(path):
+    """Changes working directory and returns to previous on exit."""
+    prev_cwd = Path.cwd()
+    # before python 3.6 chdir doesn't support paths from pathlib
+    os.chdir(str(path))
+    try:
+        yield
+    finally:
+        os.chdir(str(prev_cwd))