fix tests with unreleased version of schema_salad

Author: manu-chroma

tests/test_examples.py

@@ -118,7 +118,7 @@ class TestFactory(unittest.TestCase):
     def test_factory(self):
         f = cwltool.factory.Factory()
         echo = f.make(get_data("tests/echo.cwl"))
-        self.assertEqual(echo(inp="foo"), {"out": "foo\n"})
+        self.assertEqual(echo(inp="foo"), {"out": b"foo\n"})
 
     def test_partial_scatter(self):
         f = cwltool.factory.Factory(on_error="continue")

tests/test_fetch.py

@@ -35,15 +35,15 @@ def check_exists(self, url):  # type: (unicode) -> bool
                 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 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):
             return "baz:bar/" + a