toggle some tests based upon docker availability, not OS

Author: mr-c

tests/test_check.py

@@ -8,14 +8,12 @@
 import cwltool.workflow
 import pytest
 from cwltool.main import main
-from cwltool.utils import onWindows
 
-from .util import get_data
+from .util import get_data, needs_docker
 
 
 class TestCheck(unittest.TestCase):
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+    @needs_docker
     def test_output_checking(self):
         self.assertEquals(main([get_data('tests/wf/badout1.cwl')]), 1)
         self.assertEquals(main([get_data('tests/wf/badout2.cwl')]), 1)

tests/test_examples.py

@@ -8,7 +8,6 @@
 from io import StringIO
 
 from cwltool.errors import WorkflowException
-from cwltool.utils import onWindows
 
 try:
     reload
@@ -26,7 +25,7 @@
 import schema_salad.validate
 from cwltool.main import main
 
-from .util import get_data
+from .util import get_data, needs_docker
 
 sys.argv = ['']
 
@@ -603,9 +602,7 @@ def test_no_js_console(self):
             self.assertNotIn("[err] Error message", stderr)
 
 
-@pytest.mark.skipif(onWindows(),
-                    reason="Instance of cwltool is used, on Windows it invokes a default docker container"
-                           "which is not supported on AppVeyor")
+@needs_docker
 class TestCache(TestCmdLine):
     def test_wf_without_container(self):
         test_file = "hello-workflow.cwl"
@@ -614,9 +611,7 @@ def test_wf_without_container(self):
         self.assertIn("completed success", stderr)
         self.assertEquals(error_code, 0)
 
-@pytest.mark.skipif(onWindows(),
-                    reason="Instance of cwltool is used, on Windows it invokes a default docker container"
-                           "which is not supported on AppVeyor")
+@needs_docker
 class TestChecksum(TestCmdLine):
 
     def test_compute_checksum(self):

tests/test_ext.py

@@ -11,11 +11,10 @@
 import cwltool.workflow
 from cwltool.main import main
 from cwltool.utils import onWindows
-from .util import get_data
+from .util import get_data, needs_docker
 
 
-@pytest.mark.skipif(onWindows(),
-                    reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+@needs_docker
 class TestListing(unittest.TestCase):
     def test_missing_enable_ext(self):
         # Require that --enable-ext is provided.

tests/test_override.py

@@ -8,15 +8,13 @@
 import pytest
 import json
 from cwltool.main import main
-from cwltool.utils import onWindows
 from six import StringIO
 
-from .util import get_data
+from .util import get_data, needs_docker
 
 
 class TestOverride(unittest.TestCase):
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+    @needs_docker
     def test_overrides(self):
         sio = StringIO()
 

tests/test_pack.py

@@ -17,8 +17,7 @@
 from cwltool.load_tool import fetch_document, validate_document
 from cwltool.main import makeRelative, main, print_pack
 from cwltool.pathmapper import adjustDirObjs, adjustFileObjs
-from cwltool.utils import onWindows
-from .util import get_data
+from .util import get_data, needs_docker
 
 
 class TestPack(unittest.TestCase):
@@ -96,9 +95,7 @@ def _pack_idempotently(self, document):
         double_packed = json.loads(print_pack(document_loader, processobj, uri2, metadata))
         self.assertEqual(packed, double_packed)
 
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of cwltool is used, on Windows it invokes a default docker container"
-                               "which is not supported on AppVeyor")
+    @needs_docker
     def test_packed_workflow_execution(self):
         load_tool.loaders = {}
         test_wf = "tests/wf/count-lines1-wf.cwl"
@@ -122,9 +119,7 @@ def test_packed_workflow_execution(self):
         self.assertEquals(json.loads(packed_output.getvalue()), json.loads(normal_output.getvalue()))
         os.remove(temp_packed_path)
 
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of cwltool is used, on Windows it invokes a default docker container"
-                               "which is not supported on AppVeyor")
+    @needs_docker
     def test_preserving_namespaces(self):
         test_wf = "tests/wf/formattest.cwl"
         test_wf_job = "tests/wf/formattest-job.json"

tests/test_relax_path_checks.py

@@ -3,8 +3,8 @@
 import pytest
 from tempfile import NamedTemporaryFile
 
+from .util import needs_docker
 from cwltool.main import main
-from cwltool.utils import onWindows
 
 
 class ToolArgparse(unittest.TestCase):
@@ -26,8 +26,7 @@ class ToolArgparse(unittest.TestCase):
 baseCommand: [cat]
 '''
 
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+    @needs_docker
     def test_spaces_in_input_files(self):
         with NamedTemporaryFile(mode='w', delete=False) as f:
             f.write(self.script)

tests/test_toolargparse.py

@@ -4,9 +4,8 @@
 from tempfile import NamedTemporaryFile
 
 from cwltool.main import main
-from cwltool.utils import onWindows
 
-from .util import get_data
+from .util import get_data, needs_docker
 
 class ToolArgparse(unittest.TestCase):
     script = '''
@@ -66,8 +65,7 @@ class ToolArgparse(unittest.TestCase):
 outputs: []
 '''
 
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+    @needs_docker
     def test_help(self):
         with NamedTemporaryFile(mode='w', delete=False) as f:
             f.write(self.script)
@@ -79,8 +77,7 @@ def test_help(self):
                 get_data('tests/echo.cwl')]), 0)
 
 
-    @pytest.mark.skipif(onWindows(),
-                        reason="Instance of Cwltool is used, On windows that invoke a default docker Container")
+    @needs_docker
     def test_bool(self):
         with NamedTemporaryFile(mode='w', delete=False) as f:
             f.write(self.script2)

tests/util.py

@@ -3,7 +3,8 @@
 
 from pkg_resources import (Requirement, ResolutionError,  # type: ignore
                            resource_filename)
-
+import distutils.spawn
+import pytest
 
 def get_data(filename):
     filename = os.path.normpath(
@@ -17,3 +18,8 @@ def get_data(filename):
     if not filepath or not os.path.isfile(filepath):
         filepath = os.path.join(os.path.dirname(__file__), os.pardir, filename)
     return filepath
+
+
+needs_docker = pytest.mark.skipif(not bool(distutils.spawn.find_executable('docker')),
+                                  reason="Requires the docker executable on the "
+                                  "system path.")