Fix regression resolving absolute path with fragment identifier. (#736)

* Fix regression resolving absolute path with fragment identifier.

Author: tetron

cwltool/resolver.py

@@ -14,12 +14,15 @@
 
 
 def resolve_local(document_loader, uri):
-    if uri.startswith("/") and os.path.exists(uri):
-        return Path(uri).as_uri()
-    if os.path.exists(urllib.parse.urlparse(
-            urllib.parse.urldefrag(
-                "{}/{}".format(Path.cwd().as_uri(), uri))[0])[2]):
-        return "{}/{}".format(Path.cwd().as_uri(), uri)
+    pathpart, frag = urllib.parse.urldefrag(uri)
+    pathobj = Path(pathpart).resolve()
+
+    if pathobj.is_file():
+        if frag:
+            return "{}#{}".format(pathobj.as_uri(), frag)
+        else:
+            return pathobj.as_uri()
+
     sharepaths = [os.environ.get("XDG_DATA_HOME", os.path.join(
         os.path.expanduser('~'), ".local", "share"))]
     sharepaths.extend(os.environ.get(

tests/test_fetch.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 import unittest
+import sys
+import os
 
 from six.moves import urllib
 
@@ -9,7 +11,14 @@
 from cwltool.load_tool import load_tool
 from cwltool.main import main
 from cwltool.workflow import defaultMakeTool
+from cwltool.resolver import resolve_local
 
+if sys.version_info < (3, 4):
+    from pathlib2 import Path
+else:
+    from pathlib import Path
+
+from .util import get_data
 
 class FetcherTest(unittest.TestCase):
     def test_fetcher(self):
@@ -56,3 +65,21 @@ def test_resolver(d, a):
 
         self.assertEquals(0, main(["--print-pre", "--debug", "foo.cwl"], resolver=test_resolver,
                                   fetcher_constructor=TestFetcher))
+
+
+class ResolverTest(unittest.TestCase):
+    def test_resolve_local(self):
+        origpath = os.getcwd()
+        os.chdir(os.path.join(get_data("")))
+        try:
+            root = Path.cwd()
+            rooturi = root.as_uri()
+            self.assertEqual(rooturi+"/tests/echo.cwl", resolve_local(None, os.path.join("tests", "echo.cwl")))
+            self.assertEqual(rooturi+"/tests/echo.cwl#main", resolve_local(None, os.path.join("tests", "echo.cwl")+"#main"))
+            self.assertEqual(rooturi+"/tests/echo.cwl", resolve_local(None, str(root / "tests" / "echo.cwl")))
+            # On Windows and Python 2.7, the left side of this test returns
+            # file:///C:/ (uppercase drive letter) and the right side returns
+            # file:///c:/ (lowercase drive letter) so force a lowercase comparison.
+            self.assertEqual((rooturi+"/tests/echo.cwl#main").lower(), resolve_local(None, str(root / "tests" / "echo.cwl")+"#main").lower())
+        finally:
+            os.chdir(origpath)