Merge pull request #1014 from common-workflow-language/cwlVersion-travis-fix

Fixed inconsistent travis tests

Author: mb1069

tests/test_parallel.py

@@ -2,12 +2,14 @@
 
 from cwltool.context import RuntimeContext
 from cwltool.executors import MultithreadedJobExecutor
+from cwltool import load_tool
 
 from .util import get_data, get_windows_safe_factory, windows_needs_docker
 
 
 @windows_needs_docker
 def test_sequential_workflow():
+    load_tool.loaders = {}
     test_file = "tests/wf/count-lines1-wf.cwl"
     executor = MultithreadedJobExecutor()
     runtime_context = RuntimeContext()
@@ -21,6 +23,7 @@ def test_sequential_workflow():
 
 @windows_needs_docker
 def test_scattered_workflow():
+    load_tool.loaders = {}
     test_file = "tests/wf/scatter-wf4.cwl"
     job_file = "tests/wf/scatter-job2.json"
     factory = get_windows_safe_factory(executor=MultithreadedJobExecutor())

tests/test_target.py

@@ -1,10 +1,12 @@
 from cwltool.main import main
+from cwltool import load_tool
 
 from .util import get_data, windows_needs_docker
 
 
 @windows_needs_docker
 def test_target():
+    load_tool.loaders = {}
     """Test --target option successful."""
     test_file = "tests/wf/scatter-wf4.cwl"
     exit_code = main(['--target', 'out', get_data(test_file),
@@ -13,6 +15,7 @@ def test_target():
 
 
 def test_wrong_target():
+    load_tool.loaders = {}
     """Test --target option when value is wrong."""
     test_file = "tests/wf/scatter-wf4.cwl"
     exit_code = main(['--target', 'dummy_target',
@@ -23,6 +26,7 @@ def test_wrong_target():
 
 @windows_needs_docker    
 def test_target_packed():
+    load_tool.loaders = {}
     """Test --target option with packed workflow schema."""
     test_file = "tests/wf/scatter-wf4.json"
     exit_code = main(['--target', 'out',