18888: Fix tests

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz@curii.com>

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 1054d8f29bdb627c6b8710429534dada68edddea..c934274fcb5eedd70bfc293a1ac23375b091edf7 100644 (file)
--- 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 49d5944c06d81f6f3ece48c8f37ce5421859a942..be5f6bf1a13b3872d59ae80c2b78ddf4159105f3 100644 (file)
--- 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 61892bf2a447395708359a7da7e3bf4798603626..aecc7a590be046fafce94b588c4af6bf4286aad5 100644 (file)
--- 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 4715c10a5e27d92d2f59bba9cca220761d20a041..42c7b251f86615538263a13676353dcf01e4ccdf 100644 (file)
--- 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 0b13e3a8192328b069c1057103cfe80f7e025f6a..644f87fd53fc085f477761dd878ea9c5d4a810e8 100644 (file)
--- 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"