From dec2837a7cb9d6c0538e7a4b699fd08435e8353a Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 6 May 2022 15:24:23 -0400 Subject: [PATCH] 19070: Fix tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/tests/test_copy_deps.py | 8 ++++---- sdk/cwl/tests/test_submit.py | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/sdk/cwl/tests/test_copy_deps.py b/sdk/cwl/tests/test_copy_deps.py index 298a6800f8..2b78db8b0b 100644 --- a/sdk/cwl/tests/test_copy_deps.py +++ b/sdk/cwl/tests/test_copy_deps.py @@ -136,7 +136,7 @@ def test_execute(): finally: api.groups().delete(uuid=group["uuid"]).execute() - -test_create() -test_update() -test_execute() +if __name__ == '__main__': + test_create() + test_update() + test_execute() diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index 6951a082d3..ba0557a9c0 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -47,12 +47,14 @@ _rootDesc = None def stubs(func): @functools.wraps(func) + @mock.patch("arvados_cwl.arvdocker.determine_image_id") @mock.patch("uuid.uuid4") @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_client1, keep_client2, keepdocker, uuid4, *args, **kwargs): + def wrapped(self, events, keep_client1, keep_client2, keepdocker, + uuid4, determine_image_id, *args, **kwargs): class Stubs(object): pass stubs = Stubs() @@ -63,6 +65,8 @@ def stubs(func): "df80736f-f14d-4b10-b2e3-03aa27f034b2", "df80736f-f14d-4b10-b2e3-03aa27f034b3", "df80736f-f14d-4b10-b2e3-03aa27f034b4", "df80736f-f14d-4b10-b2e3-03aa27f034b5"] + determine_image_id.return_value = None + def putstub(p, **kwargs): return "%s+%i" % (hashlib.md5(p).hexdigest(), len(p)) keep_client1().put.side_effect = putstub -- 2.30.2