13306: Updating get_current_container to raise when not a 404

Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/util.py b/sdk/cwl/arvados_cwl/util.py
index 98a2a89a1d281e056ee3067752e6094349123115..776fc6bc25dae06e232e2546cab501246d6cd6b3 100644 (file)
--- a/sdk/cwl/arvados_cwl/util.py
+++ b/sdk/cwl/arvados_cwl/util.py
@@ -26,6 +26,9 @@ def get_current_container(api, num_retries=0, logger=None):
         current_container = api.containers().current().execute(num_retries=num_retries)
     except ApiError as e:
         # Status code 404 just means we're not running in a container.
-        if e.resp.status != 404 and logger:
-            logger.info("Getting current container: %s", e)
+        if e.resp.status != 404:
+            if logger:
+                logger.info("Getting current container: %s", e)
+            raise e
+            
     return current_container

diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index d588822716a4ccc385d7223fecf38e1cd2a88e24..2200d995166eb325c30cad7db02cef4b26b3ab05 100644 (file)
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -44,4 +44,5 @@ class TestUtil(unittest.TestCase):
         api.containers().current().execute.side_effect = ApiError(httplib2.Response({"status": 300}), bytes(b""))
         logger = mock.MagicMock()
 
-        self.assertRaises(ApiError, get_current_container(api, num_retries=0, logger=logger))
\ No newline at end of file
+        with self.assertRaises(ApiError):
+            get_current_container(api, num_retries=0, logger=logger)
\ No newline at end of file