skip some tests on appveyor

Author: mr-c

tests/test_examples.py

@@ -30,7 +30,8 @@
 from cwltool.main import main
 from cwltool.utils import onWindows
 
-from .util import get_data, needs_docker, get_windows_safe_factory
+from .util import (get_data, needs_docker, get_windows_safe_factory,
+        windows_needs_docker)
 
 sys.argv = ['']
 
@@ -137,6 +138,7 @@ def test_params(self):
 
 class TestFactory(unittest.TestCase):
 
+    @windows_needs_docker
     def test_factory(self):
         f = get_windows_safe_factory()
         echo = f.make(get_data("tests/echo.cwl"))

tests/test_iwdr.py

@@ -2,11 +2,12 @@
 
 import cwltool
 import cwltool.factory
-from .util import get_data, get_windows_safe_factory
+from .util import get_data, get_windows_safe_factory, windows_needs_docker
 
 
 class TestInitialWorkDir(unittest.TestCase):
 
+    @windows_needs_docker
     def test_newline_in_entry(self):
         """
         test that files in InitialWorkingDirectory are created with a newline character

tests/test_js_sandbox.py

@@ -13,7 +13,7 @@
                                exec_js_process)
 import cwltool.sandboxjs
 from cwltool.utils import onWindows
-from .util import get_data, get_windows_safe_factory
+from .util import get_data, get_windows_safe_factory, windows_needs_docker
 import pytest
 
 
@@ -47,6 +47,7 @@ def test_is_javascript_installed(self):
 
 class TestValueFrom(unittest.TestCase):
 
+    @windows_needs_docker
     def test_value_from_two_concatenated_expressions(self):
         f = get_windows_safe_factory()
         echo = f.make(get_data("tests/wf/vf-concat.cwl"))

tests/test_parallel.py

@@ -7,13 +7,11 @@
 import cwltool.factory
 from cwltool.executors import MultithreadedJobExecutor
 from cwltool.utils import onWindows
-from .util import get_data, get_windows_safe_factory
+from .util import get_data, get_windows_safe_factory, windows_needs_docker
 
 
 class TestParallel(unittest.TestCase):
-    @pytest.mark.skipif(onWindows(),
-                        reason="Unexplainable behavior: cwltool on AppVeyor does not recognize cwlVersion"
-                               "in count-lines1-wf.cwl")
+    @windows_needs_docker
     def test_sequential_workflow(self):
         test_file = "tests/wf/count-lines1-wf.cwl"
         f = cwltool.factory.Factory(executor=MultithreadedJobExecutor())
@@ -24,6 +22,7 @@ def test_sequential_workflow(self):
             }),
             {"count_output": 16})
 
+    @windows_needs_docker
     def test_scattered_workflow(self):
         test_file = "tests/wf/scatter-wf4.cwl"
         job_file = "tests/wf/scatter-job2.json"

tests/util.py

@@ -43,3 +43,8 @@ def get_data(filename):
 needs_docker = pytest.mark.skipif(not bool(distutils.spawn.find_executable('docker')),
                                   reason="Requires the docker executable on the "
                                   "system path.")
+
+windows_needs_docker = pytest.mark.skipif(
+        onWindows() and not bool(distutils.spawn.find_executable('docker')),
+        reason="Running this test on MS Windows requires the docker executable "
+        "on the system path.")