Merge pull request #465 from common-workflow-language/jenkins

upload the cwltool-conformance jenkins build script

Author: mr-c

jenkins.bash

@@ -0,0 +1,24 @@
+#!/usr/bin/bash
+cloneorpull() {
+        if test -d $1 ; then
+                (cd $1 && git pull)
+        else
+                git clone $2
+        fi
+}
+venv() {
+        if ! test -d $1 ; then
+                virtualenv $1
+        fi
+        . $1/bin/activate
+}
+cloneorpull common-workflow-language https://github.com/common-workflow-language/common-workflow-language.git
+venv cwltool-venv
+(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install -U setuptools wheel pip)
+(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ python setup.py install)
+(. cwltool-venv/bin/activate && PIP_DOWNLOAD_CACHE=/var/lib/jenkins/pypi-cache/ pip install "cwltest>=1.0.20160825151655")
+# (. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-2)
+(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=draft-3)
+(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool)
+(. cwltool-venv/bin/activate && cd common-workflow-language && ./run_test.sh --junit-xml=result.xml RUNNER=cwltool DRAFT=v1.1.0-dev1 EXTRA=--enable-dev)
+(. cwltool-venv/bin/activate && ./build-cwl-docker.sh && docker push commonworkflowlanguage/cwltool_module && docker push commonworkflowlanguage/cwltool)

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