Merge branch 'main' into 19385-cwl-fast-pack

[arvados.git] / sdk / cwl / tests / test_util.py

diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 2200d995166eb325c30cad7db02cef4b26b3ab05..1209b88d8eb6d4a2d70d5632dfbc34e367ccf257 100644 (file)
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -29,7 +29,7 @@ class TestUtil(unittest.TestCase):
 
         self.assertEqual(info["name"], "Intermediate collection for step one")
         self.assertEqual(info["trash_at"], datetime.datetime(2018, 1, 1, 0, 2, 0, 0))
-        self.assertEqual(info["properties"], {"type" : "intermediate", "container" : "zzzzz-8i9sb-zzzzzzzzzzzzzzz"})
+        self.assertEqual(info["properties"], {"type" : "intermediate", "container_uuid" : "zzzzz-8i9sb-zzzzzzzzzzzzzzz"})
 
     def test_get_current_container_success(self):
         api = mock.MagicMock()
@@ -45,4 +45,12 @@ class TestUtil(unittest.TestCase):
         logger = mock.MagicMock()
 
         with self.assertRaises(ApiError):
-            get_current_container(api, num_retries=0, logger=logger)
\ No newline at end of file
+            get_current_container(api, num_retries=0, logger=logger)
+
+    def test_get_current_container_404_error(self):
+        api = mock.MagicMock()
+        api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 404}), bytes(b""))
+        logger = mock.MagicMock()
+
+        current_container = get_current_container(api, num_retries=0, logger=logger)
+        self.assertEqual(current_container, None)
\ No newline at end of file