X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f7e07c3a28d4f4e1adbd957749bd825e44a2e523..cdcddca613c896fd8395a4045c858945451c3fa0:/sdk/cwl/tests/test_submit.py diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index d383a48e94..4e343b6265 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -30,20 +30,22 @@ class TestSubmit(unittest.TestCase): api.collections().create.assert_has_calls([ mock.call(), - mock.call(body={'manifest_text': './tool b0fa9cffda3d37ba401bc338bb0b54a6+257 0:16:blub.txt 16:241:submit_tool.cwl\n./wf 888e237b758adf86ca66c36f7bd88a24+175 0:175:submit_wf.cwl\n', - 'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz', - 'name': 'submit_wf.cwl' - }, ensure_unique_name=True), - mock.call().execute(), - mock.call(body={'manifest_text': '. 979af1245a12a1fed634d4222473bfdc+16 0:16:blorp.txt\n', - 'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz', - 'name': 'submit_test_job.json' - }, ensure_unique_name=True), - mock.call().execute()]) - api.jobs().create.assert_called_with(body={ - 'runtime_constraints': { - 'docker_image': 'arvados/jobs' - }, + mock.call(body={'manifest_text': './tool 84ec4df683711de31b782505389a8843+429 0:16:blub.txt 16:413:submit_tool.cwl\n./wf 81d977a245a41b8e79859fbe00623fd0+344 0:344:submit_wf.cwl\n', + 'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz', + 'name': 'submit_wf.cwl' + }, ensure_unique_name=True), + mock.call().execute(), + mock.call(body={'manifest_text': '. 979af1245a12a1fed634d4222473bfdc+16 0:16:blorp.txt\n', + 'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz', + 'name': '#' + }, ensure_unique_name=True), + mock.call().execute()]) + + api.jobs().create.assert_called_with( + body={ + 'runtime_constraints': { + 'docker_image': 'arvados/jobs' + }, 'script_parameters': { 'x': { 'path': '99999999999999999999999999999992+99/blorp.txt', @@ -52,7 +54,7 @@ class TestSubmit(unittest.TestCase): 'cwl:tool': '99999999999999999999999999999991+99/wf/submit_wf.cwl' }, 'repository': 'arvados', - 'script_version': 'master', - 'script': 'cwl-runner' - }, - find_or_create=True) + 'script_version': 'master', + 'script': 'cwl-runner' + }, + find_or_create=True)