From 6601cb2a725cb5bde25da9cc73adda4bdd2bf006 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Thu, 21 Apr 2022 12:12:53 -0400 Subject: [PATCH] 18888: Fix tests Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .../collection_per_tool_packed.cwl | 20 +++++++++++++++---- sdk/cwl/tests/submit_test_job.json | 3 ++- sdk/cwl/tests/test_submit.py | 8 +++++++- sdk/cwl/tests/wf/expect_packed.cwl | 8 ++++++-- sdk/cwl/tests/wf/expect_upload_packed.cwl | 8 ++++++-- 5 files changed, 37 insertions(+), 10 deletions(-) diff --git a/sdk/cwl/tests/collection_per_tool/collection_per_tool_packed.cwl b/sdk/cwl/tests/collection_per_tool/collection_per_tool_packed.cwl index 1054d8f29b..c934274fcb 100644 --- a/sdk/cwl/tests/collection_per_tool/collection_per_tool_packed.cwl +++ b/sdk/cwl/tests/collection_per_tool/collection_per_tool_packed.cwl @@ -41,16 +41,22 @@ "inputs": [ { "default": { + "basename": "a.txt", "class": "File", - "location": "keep:b9fca8bf06b170b8507b80b2564ee72b+57/a.txt" + "location": "keep:b9fca8bf06b170b8507b80b2564ee72b+57/a.txt", + "nameext": ".txt", + "nameroot": "a" }, "id": "#step1.cwl/a", "type": "File" }, { "default": { + "basename": "b.txt", "class": "File", - "location": "keep:b9fca8bf06b170b8507b80b2564ee72b+57/b.txt" + "location": "keep:b9fca8bf06b170b8507b80b2564ee72b+57/b.txt", + "nameext": ".txt", + "nameroot": "b" }, "id": "#step1.cwl/b", "type": "File" @@ -69,16 +75,22 @@ "inputs": [ { "default": { + "basename": "b.txt", "class": "File", - "location": "keep:8e2d09a066d96cdffdd2be41579e4e2e+57/b.txt" + "location": "keep:8e2d09a066d96cdffdd2be41579e4e2e+57/b.txt", + "nameext": ".txt", + "nameroot": "b" }, "id": "#step2.cwl/b", "type": "File" }, { "default": { + "basename": "c.txt", "class": "File", - "location": "keep:8e2d09a066d96cdffdd2be41579e4e2e+57/c.txt" + "location": "keep:8e2d09a066d96cdffdd2be41579e4e2e+57/c.txt", + "nameext": ".txt", + "nameroot": "c" }, "id": "#step2.cwl/c", "type": "File" diff --git a/sdk/cwl/tests/submit_test_job.json b/sdk/cwl/tests/submit_test_job.json index 49d5944c06..be5f6bf1a1 100644 --- a/sdk/cwl/tests/submit_test_job.json +++ b/sdk/cwl/tests/submit_test_job.json @@ -18,6 +18,7 @@ "basename": "renamed.txt", "class": "File", "location": "keep:99999999999999999999999999999998+99/file1.txt" - }] + }], + "location": "_:df80736f-f14d-4b10-b2e3-03aa27f034bb" } } diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index 61892bf2a4..aecc7a590b 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -47,17 +47,22 @@ _rootDesc = None def stubs(func): @functools.wraps(func) + @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, *args, **kwargs): + def wrapped(self, events, keep_client1, keep_client2, keepdocker, uuid4, *args, **kwargs): class Stubs(object): pass stubs = Stubs() stubs.events = events stubs.keepdocker = keepdocker + uuid4.side_effect = ["df80736f-f14d-4b10-b2e3-03aa27f034bb", "df80736f-f14d-4b10-b2e3-03aa27f034b1", + "df80736f-f14d-4b10-b2e3-03aa27f034b2", "df80736f-f14d-4b10-b2e3-03aa27f034b3", + "df80736f-f14d-4b10-b2e3-03aa27f034b4", "df80736f-f14d-4b10-b2e3-03aa27f034b5"] + def putstub(p, **kwargs): return "%s+%i" % (hashlib.md5(p).hexdigest(), len(p)) keep_client1().put.side_effect = putstub @@ -1604,6 +1609,7 @@ class TestCreateWorkflow(unittest.TestCase): self.existing_workflow_uuid + '\n') self.assertEqual(exited, 0) + @stubs def test_update_name(self, stubs): exited = arvados_cwl.main( diff --git a/sdk/cwl/tests/wf/expect_packed.cwl b/sdk/cwl/tests/wf/expect_packed.cwl index 4715c10a5e..42c7b251f8 100644 --- a/sdk/cwl/tests/wf/expect_packed.cwl +++ b/sdk/cwl/tests/wf/expect_packed.cwl @@ -11,8 +11,11 @@ "inputs": [ { "default": { + "basename": "blub.txt", "class": "File", - "location": "keep:5d373e7629203ce39e7c22af98a0f881+52/blub.txt" + "location": "keep:5d373e7629203ce39e7c22af98a0f881+52/blub.txt", + "nameext": ".txt", + "nameroot": "blub" }, "id": "#submit_tool.cwl/x", "inputBinding": { @@ -68,7 +71,8 @@ "nameroot": "renamed", "size": 0 } - ] + ], + "location": "_:df80736f-f14d-4b10-b2e3-03aa27f034b2" }, "id": "#main/z", "type": "Directory" diff --git a/sdk/cwl/tests/wf/expect_upload_packed.cwl b/sdk/cwl/tests/wf/expect_upload_packed.cwl index 0b13e3a819..644f87fd53 100644 --- a/sdk/cwl/tests/wf/expect_upload_packed.cwl +++ b/sdk/cwl/tests/wf/expect_upload_packed.cwl @@ -11,8 +11,11 @@ "inputs": [ { "default": { + "basename": "blub.txt", "class": "File", - "location": "keep:5d373e7629203ce39e7c22af98a0f881+52/blub.txt" + "location": "keep:5d373e7629203ce39e7c22af98a0f881+52/blub.txt", + "nameext": ".txt", + "nameroot": "blub" }, "id": "#submit_tool.cwl/x", "inputBinding": { @@ -74,7 +77,8 @@ "nameroot": "renamed", "size": 0 } - ] + ], + "location": "_:df80736f-f14d-4b10-b2e3-03aa27f034b2" }, "id": "#main/z", "type": "Directory" -- 2.30.2