[ARVADOS] updated: 1.3.0-161-gbe57c52f8

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py |  3 ++-
 sdk/cwl/arvados_cwl/runner.py   |  3 ++-
 sdk/cwl/tests/test_submit.py    |  3 ++-
 sdk/cwl/tests/test_util.py      | 10 +++++++++-
 4 files changed, 15 insertions(+), 4 deletions(-)

       via  be57c52f8ea23852d9d00ab1981b41354f59f27d (commit)
       via  8855c1dea7f258f61aa8815efdb582d0f096ce3c (commit)
      from  7360ecf9c5bd593834c45b1ad60bf0b6ac30d05e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit be57c52f8ea23852d9d00ab1981b41354f59f27d
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 11:21:04 2019 -0500

    13306: Updating dict value iteration to be more efficient with py2
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index e5a3d5985..14ea8c534 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -5,6 +5,7 @@
 from __future__ import division
 from builtins import next
 from builtins import object
+from future.utils import viewvalues
 from past.utils import old_div
 
 import argparse
@@ -411,7 +412,7 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
                             "Option 'dockerOutputDirectory' must be an absolute path.")
             if obj.get("class") == "http://commonwl.org/cwltool#Secrets" and self.work_api != "containers":
                 raise SourceLine(obj, "class", UnsupportedRequirement).makeError("Secrets not supported with --api=jobs")
-            for v in obj.values():
+            for v in viewvalues(obj):
                 self.check_features(v)
         elif isinstance(obj, list):
             for i,v in enumerate(obj):
diff --git a/sdk/cwl/arvados_cwl/runner.py b/sdk/cwl/arvados_cwl/runner.py
index 70cbcaf0a..389750523 100644
--- a/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@ -4,6 +4,7 @@
 
 from future import standard_library
 standard_library.install_aliases()
+from future.utils import viewvalues
 
 import os
 import urllib.parse
@@ -64,7 +65,7 @@ def find_defaults(d, op):
         if "default" in d:
             op(d)
         else:
-            for i in d.values():
+            for i in viewvalues(d):
                 find_defaults(i, op)
 
 def setSecondary(t, fileobj, discovered):
diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index a1ace717b..782282d2a 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -6,6 +6,7 @@ from future import standard_library
 standard_library.install_aliases()
 from builtins import object
 from builtins import str
+from future.utils import viewvalues
 
 import copy
 import io
@@ -101,7 +102,7 @@ def stubs(func):
             return CollectionExecute(created_collections[uuid])
 
         def collection_getstub(created_collections, uuid):
-            for v in created_collections.values():
+            for v in viewvalues(created_collections):
                 if uuid in (v["uuid"], v["portable_data_hash"]):
                     return CollectionExecute(v)
 

commit 8855c1dea7f258f61aa8815efdb582d0f096ce3c
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 11:11:35 2019 -0500

    13306: Adds test for when get_current_container results in a 404
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/tests/test_util.py b/sdk/cwl/tests/test_util.py
index 2200d9951..3ca02c7df 100644
--- a/sdk/cwl/tests/test_util.py
+++ b/sdk/cwl/tests/test_util.py
@@ -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

-----------------------------------------------------------------------


hooks/post-receive
--