[ARVADOS] updated: 495a7df016f63ae348000b1c046f8e1c5f1c5903

Git user git at public.curoverse.com
Fri Jan 6 13:41:23 EST 2017


Summary of changes:
 sdk/cwl/arvados_cwl/__init__.py      | 22 ++++++-------
 sdk/cwl/arvados_cwl/arvcontainer.py  |  8 +++--
 sdk/cwl/arvados_cwl/arvjob.py        |  6 ++--
 sdk/cwl/arvados_cwl/crunch_script.py |  8 ++++-
 sdk/cwl/arvados_cwl/runner.py        |  3 +-
 sdk/cwl/setup.py                     |  2 +-
 sdk/cwl/tests/test_submit.py         | 61 +++++++++++++++++++++++++++++++-----
 7 files changed, 84 insertions(+), 26 deletions(-)

       via  495a7df016f63ae348000b1c046f8e1c5f1c5903 (commit)
       via  83a0c3c06e3d6c58da44cd433573b732c59f3beb (commit)
       via  4695df7994cc54765681ac1f97111dbc065fadaf (commit)
       via  e33f8c3fe2bd7b9d4d4f63540d38cd9732b7f854 (commit)
       via  74e9a4dd2edc0b17d08d9b5ac8c7293dd9e93503 (commit)
       via  5f8e65c488277b3f259f791d1cd17361bd67009d (commit)
      from  84968bdae36586c875a50cc82662de84a5118dfa (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 495a7df016f63ae348000b1c046f8e1c5f1c5903
Merge: 84968bd 83a0c3c
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Jan 6 13:41:11 2017 -0500

    Merge branch '10793-cwl-continue-on-error' closes #10793

diff --cc sdk/cwl/tests/test_submit.py
index 14ae7b9,0ee90c8..0a01fb4
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@@ -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(

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list