14886: Fixes mock issue between tests

[arvados.git] / sdk / cwl / arvados_cwl / crunch_script.py

diff --git a/sdk/cwl/arvados_cwl/crunch_script.py b/sdk/cwl/arvados_cwl/crunch_script.py
index 9f0c91f111b0f547c2bb60f3f9c48faf0bbe0404..c886550d41606e60e04f0142e55519e5ea33c89a 100644 (file)
--- a/sdk/cwl/arvados_cwl/crunch_script.py
+++ b/sdk/cwl/arvados_cwl/crunch_script.py
@@ -10,6 +10,9 @@
 # tool.  When the workflow completes, record the output object in an output
 # collection for this runner job.
 
+from past.builtins import basestring
+from future.utils import viewitems
+
 import arvados
 import arvados_cwl
 import arvados.collection
@@ -61,7 +64,7 @@ def run():
             if "location" in v:
                 v["location"] = keeppath(v["location"])
 
-        for k,v in job_order_object.items():
+        for k,v in viewitems(job_order_object):
             if isinstance(v, basestring) and arvados.util.keep_locator_pattern.match(v):
                 job_order_object[k] = {
                     "class": "File",
@@ -103,8 +106,9 @@ def run():
         arvargs.output_name = output_name
         arvargs.output_tags = output_tags
         arvargs.thread_count = 1
+        arvargs.collection_cache_size = None
 
-        runner = arvados_cwl.ArvCwlRunner(api_client=arvados.safeapi.ThreadSafeApiCache(
+        runner = arvados_cwl.ArvCwlExecutor(api_client=arvados.safeapi.ThreadSafeApiCache(
             api_params={"model": OrderedJsonModel()}, keep_params={"num_retries": 4}),
                                           arvargs=arvargs)