X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/98fcb678a39f72945a9c947315beb31178bd4fc3..eae48c31bb338689ec67fbc6a14a2e0b1fb5e3b6:/sdk/cwl/tests/test_submit.py?ds=sidebyside diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index 409557ccaf..c195b03916 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -11,6 +11,7 @@ import unittest import arvados import arvados.collection import arvados_cwl +import arvados_cwl.runner import arvados.keep from .matcher import JsonDiffMatcher @@ -351,6 +352,48 @@ class TestSubmit(unittest.TestCase): 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