[ARVADOS] updated: 2.1.0-2391-g8b4b7e7ed
Git user
git at public.arvados.org
Fri May 6 19:24:34 UTC 2022
Summary of changes:
sdk/cwl/tests/test_copy_deps.py | 8 ++++----
sdk/cwl/tests/test_submit.py | 6 +++++-
2 files changed, 9 insertions(+), 5 deletions(-)
via 8b4b7e7edb68a9c252bcc57b2d291b0f6e7a7ce9 (commit)
from 1eb881796a672247db251fd7298b0a7253f83259 (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 8b4b7e7edb68a9c252bcc57b2d291b0f6e7a7ce9
Author: Peter Amstutz <peter.amstutz at curii.com>
Date: Fri May 6 15:24:23 2022 -0400
19070: Fix tests
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>
diff --git a/sdk/cwl/tests/test_copy_deps.py b/sdk/cwl/tests/test_copy_deps.py
index 298a6800f..2b78db8b0 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 6951a082d..ba0557a9c 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
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list