X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0e5198142fdba0ce2af6eb2852d45dff46ffb2e2..eae48c31bb338689ec67fbc6a14a2e0b1fb5e3b6:/sdk/cwl/tests/test_submit.py diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index 0ff9da927a..c195b03916 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -11,35 +11,42 @@ import unittest import arvados import arvados.collection import arvados_cwl +import arvados_cwl.runner import arvados.keep from .matcher import JsonDiffMatcher +from .mock_discovery import get_rootDesc +_rootDesc = None def stubs(func): @functools.wraps(func) @mock.patch("arvados.commands.keepdocker.list_images_in_arv") @mock.patch("arvados.collection.KeepClient") + @mock.patch("arvados.keep.KeepClient") @mock.patch("arvados.events.subscribe") - def wrapped(self, events, keep_client, keepdocker, *args, **kwargs): + def wrapped(self, events, keep_client1, keep_client2, keepdocker, *args, **kwargs): class Stubs: pass stubs = Stubs() stubs.events = events stubs.keepdocker = keepdocker - stubs.keep_client = keep_client + def putstub(p, **kwargs): return "%s+%i" % (hashlib.md5(p).hexdigest(), len(p)) - stubs.keep_client().put.side_effect = putstub - stubs.keep_client.put.side_effect = putstub + keep_client1().put.side_effect = putstub + keep_client1.put.side_effect = putstub + keep_client2().put.side_effect = putstub + keep_client2.put.side_effect = putstub + stubs.keep_client = keep_client2 stubs.keepdocker.return_value = [("zzzzz-4zz18-zzzzzzzzzzzzzz3", "")] stubs.fake_user_uuid = "zzzzz-tpzed-zzzzzzzzzzzzzzz" - stubs.api = mock.MagicMock() - stubs.api._rootDesc = arvados.api('v1')._rootDesc + stubs.api._rootDesc = get_rootDesc() + stubs.api.users().current().execute.return_value = { "uuid": stubs.fake_user_uuid, } @@ -91,7 +98,7 @@ def stubs(func): } stubs.expect_job_spec = { 'runtime_constraints': { - 'docker_image': 'arvados/jobs' + 'docker_image': 'arvados/jobs:'+arvados_cwl.__version__ }, 'script_parameters': { 'x': { @@ -117,7 +124,7 @@ def stubs(func): '99999999999999999999999999999991+99/wf/submit_wf.cwl' }, 'repository': 'arvados', - 'script_version': 'master', + 'script_version': arvados_cwl.__version__, 'script': 'cwl-runner' } stubs.pipeline_component = stubs.expect_job_spec.copy() @@ -126,7 +133,7 @@ def stubs(func): 'state': 'RunningOnServer', "components": { "cwl-runner": { - 'runtime_constraints': {'docker_image': 'arvados/jobs'}, + 'runtime_constraints': {'docker_image': 'arvados/jobs:'+arvados_cwl.__version__}, 'script_parameters': { 'y': {"value": {'basename': '99999999999999999999999999999998+99', 'location': 'keep:99999999999999999999999999999998+99', 'class': 'Directory'}}, 'x': {"value": {'basename': 'blorp.txt', 'class': 'File', 'location': 'keep:99999999999999999999999999999994+99/blorp.txt'}}, @@ -134,11 +141,13 @@ def stubs(func): 'listing': [ {'basename': 'renamed.txt', 'class': 'File', 'location': 'keep:99999999999999999999999999999998+99/file1.txt'} ]}}, - 'cwl:tool': '99999999999999999999999999999991+99/wf/submit_wf.cwl' + 'cwl:tool': '99999999999999999999999999999991+99/wf/submit_wf.cwl', + 'arv:enable_reuse': True }, 'repository': 'arvados', - 'script_version': 'master', - 'script': 'cwl-runner' + 'script_version': arvados_cwl.__version__, + 'script': 'cwl-runner', + 'job': {'state': 'Queued', 'uuid': 'zzzzz-8i9sb-zzzzzzzzzzzzzzz'} } } } @@ -175,9 +184,9 @@ def stubs(func): }, 'state': 'Committed', 'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz', - 'command': ['arvados-cwl-runner', '--local', '--api=containers', '/var/lib/cwl/workflow/submit_wf.cwl', '/var/lib/cwl/job/cwl.input.json'], + 'command': ['arvados-cwl-runner', '--local', '--api=containers', '--enable-reuse', '/var/lib/cwl/workflow/submit_wf.cwl', '/var/lib/cwl/job/cwl.input.json'], 'name': 'submit_wf.cwl', - 'container_image': '99999999999999999999999999999993+99', + 'container_image': 'arvados/jobs:'+arvados_cwl.__version__, 'output_path': '/var/spool/cwl', 'cwd': '/var/spool/cwl', 'runtime_constraints': { @@ -240,6 +249,26 @@ class TestSubmit(unittest.TestCase): self.assertEqual(capture_stdout.getvalue(), stubs.expect_pipeline_uuid + '\n') + + @mock.patch("time.sleep") + @stubs + def test_submit_no_reuse(self, stubs, tm): + capture_stdout = cStringIO.StringIO() + exited = arvados_cwl.main( + ["--submit", "--no-wait", "--debug", "--disable-reuse", + "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], + capture_stdout, sys.stderr, api_client=stubs.api) + self.assertEqual(exited, 0) + + stubs.expect_pipeline_instance["components"]["cwl-runner"]["script_parameters"]["arv:enable_reuse"] = {"value": False} + + expect_pipeline = copy.deepcopy(stubs.expect_pipeline_instance) + expect_pipeline["owner_uuid"] = stubs.fake_user_uuid + stubs.api.pipeline_instances().create.assert_called_with( + body=expect_pipeline) + self.assertEqual(capture_stdout.getvalue(), + stubs.expect_pipeline_uuid + '\n') + @mock.patch("time.sleep") @stubs def test_submit_with_project_uuid(self, stubs, tm): @@ -302,6 +331,69 @@ class TestSubmit(unittest.TestCase): self.assertEqual(capture_stdout.getvalue(), stubs.expect_container_request_uuid + '\n') + @stubs + def test_submit_container_no_reuse(self, stubs): + capture_stdout = cStringIO.StringIO() + try: + exited = arvados_cwl.main( + ["--submit", "--no-wait", "--api=containers", "--debug", "--disable-reuse", + "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], + capture_stdout, sys.stderr, api_client=stubs.api, keep_client=stubs.keep_client) + self.assertEqual(exited, 0) + except: + logging.exception("") + + stubs.expect_container_spec["command"] = ['arvados-cwl-runner', '--local', '--api=containers', '--disable-reuse', '/var/lib/cwl/workflow/submit_wf.cwl', '/var/lib/cwl/job/cwl.input.json'] + + expect_container = copy.deepcopy(stubs.expect_container_spec) + expect_container["owner_uuid"] = stubs.fake_user_uuid + stubs.api.container_requests().create.assert_called_with( + body=expect_container) + self.assertEqual(capture_stdout.getvalue(), + stubs.expect_container_request_uuid + '\n') + + @mock.patch("arvados.commands.keepdocker.find_one_image_hash") + @mock.patch("cwltool.docker.get_image") + @mock.patch("arvados.api") + def test_arvados_jobs_image(self, api, get_image, find_one_image_hash): + arvrunner = mock.MagicMock() + arvrunner.project_uuid = "" + api.return_value = mock.MagicMock() + arvrunner.api = api.return_value + arvrunner.api.links().list().execute.side_effect = ({"items": [], "items_available": 0, "offset": 0}, + {"items": [], "items_available": 0, "offset": 0}, + {"items": [], "items_available": 0, "offset": 0}, + {"items": [{"created_at": "", + "head_uuid": "", + "link_class": "docker_image_hash", + "name": "123456", + "owner_uuid": "", + "properties": {"image_timestamp": ""}}], "items_available": 1, "offset": 0}, + {"items": [], "items_available": 0, "offset": 0}, + {"items": [{"created_at": "", + "head_uuid": "", + "link_class": "docker_image_repo+tag", + "name": "arvados/jobs:"+arvados_cwl.__version__, + "owner_uuid": "", + "properties": {"image_timestamp": ""}}], "items_available": 1, "offset": 0}, + {"items": [{"created_at": "", + "head_uuid": "", + "link_class": "docker_image_hash", + "name": "123456", + "owner_uuid": "", + "properties": {"image_timestamp": ""}}], "items_available": 1, "offset": 0} , + ) + find_one_image_hash.return_value = "123456" + + arvrunner.api.collections().list().execute.side_effect = ({"items": [], "items_available": 0, "offset": 0}, + {"items": [{"uuid": "", + "owner_uuid": "", + "manifest_text": "", + "properties": "" + }], "items_available": 1, "offset": 0}, + {"items": [{"uuid": ""}], "items_available": 1, "offset": 0}) + arvrunner.api.collections().create().execute.return_value = {"uuid": ""} + self.assertEqual("arvados/jobs:"+arvados_cwl.__version__, arvados_cwl.runner.arvados_jobs_image(arvrunner)) class TestCreateTemplate(unittest.TestCase): @stubs @@ -392,7 +484,7 @@ class TestTemplateInputs(unittest.TestCase): "components": { "inputs_test.cwl": { 'runtime_constraints': { - 'docker_image': 'arvados/jobs', + 'docker_image': 'arvados/jobs:'+arvados_cwl.__version__, }, 'script_parameters': { 'cwl:tool': @@ -427,7 +519,7 @@ class TestTemplateInputs(unittest.TestCase): }, }, 'repository': 'arvados', - 'script_version': 'master', + 'script_version': arvados_cwl.__version__, 'script': 'cwl-runner', }, },