Merge branch '10793-cwl-continue-on-error' closes #10793
authorPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 6 Jan 2017 18:41:11 +0000 (13:41 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Fri, 6 Jan 2017 18:41:11 +0000 (13:41 -0500)
1  2 
sdk/cwl/arvados_cwl/arvcontainer.py
sdk/cwl/tests/test_submit.py

Simple merge
index 14ae7b9f8fee3f86a12724194ceb443349b8e634,0ee90c8c74befff6aea223b8cc6c1f4cbaf8909c..0a01fb4cc37dd99809ae306d24fd087a3d09195d
@@@ -470,9 -515,8 +515,9 @@@ class TestSubmit(unittest.TestCase)
              logging.exception("")
  
          stubs.expect_container_spec["command"] = ['arvados-cwl-runner', '--local', '--api=containers', '--no-log-timestamps',
-                                                   "--output-name="+output_name, '--enable-reuse',
+                                                   "--output-name="+output_name, '--enable-reuse', '--on-error=continue',
                                                    '/var/lib/cwl/workflow/submit_wf.cwl', '/var/lib/cwl/cwl.input.json']
 +        stubs.expect_container_spec["output_name"] = output_name
  
          expect_container = copy.deepcopy(stubs.expect_container_spec)
          stubs.api.container_requests().create.assert_called_with(