X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/79786a56410ef381499fb0bfdc5a18407ab33082..1071e1163f894c2a73df76cd400d102748e5281d:/sdk/cwl/tests/test_make_output.py diff --git a/sdk/cwl/tests/test_make_output.py b/sdk/cwl/tests/test_make_output.py index d818ccac6f..53f379f1a5 100644 --- a/sdk/cwl/tests/test_make_output.py +++ b/sdk/cwl/tests/test_make_output.py @@ -27,14 +27,15 @@ class TestMakeOutput(unittest.TestCase): readermock = mock.MagicMock() reader.return_value = readermock - final_uuid = final.manifest_locater() + final_uuid = final.manifest_locator() + num_retries = runner.num_retries cwlout = StringIO.StringIO() openmock = mock.MagicMock() final.open.return_value = openmock openmock.__enter__.return_value = cwlout - runner.make_output_collection("Test output", "tag0", { + _, runner.final_output_collection = runner.make_output_collection("Test output", "tag0,tag1,tag2", { "foo": { "class": "File", "location": "keep:99999999999999999999999999999991+99/foo.txt", @@ -44,7 +45,8 @@ class TestMakeOutput(unittest.TestCase): "bar": { "class": "File", "location": "keep:99999999999999999999999999999992+99/bar.txt", - "basename": "baz.txt" + "basename": "baz.txt", + "size": 4 } }) @@ -54,14 +56,18 @@ class TestMakeOutput(unittest.TestCase): self.assertEqual("""{ "bar": { "class": "File", - "location": "baz.txt" + "location": "baz.txt", + "size": 4 }, "foo": { "class": "File", - "location": "foo.txt" + "location": "foo.txt", + "size": 3 } }""", cwlout.getvalue()) self.assertIs(final, runner.final_output_collection) - self.assertIs(final_uuid, runner.final_output_collection.manifest_locater()) - self.api.links().create.assert_has_calls([mock.call(body={"head_uuid": final_uuid, "link_class": "tag", "name": "tag0"}), mock.call().execute()]) + self.assertIs(final_uuid, runner.final_output_collection.manifest_locator()) + self.api.links().create.assert_has_calls([mock.call(body={"head_uuid": final_uuid, "link_class": "tag", "name": "tag0"}), mock.call().execute(num_retries=num_retries)]) + self.api.links().create.assert_has_calls([mock.call(body={"head_uuid": final_uuid, "link_class": "tag", "name": "tag1"}), mock.call().execute(num_retries=num_retries)]) + self.api.links().create.assert_has_calls([mock.call(body={"head_uuid": final_uuid, "link_class": "tag", "name": "tag2"}), mock.call().execute(num_retries=num_retries)])