13627: Fix tests after rebase

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/arvcontainer.py b/sdk/cwl/arvados_cwl/arvcontainer.py
index 8e98e9604225f57b308a095a23e03dd7b2382d22..667f9262f7f92f3c70c59fdad32a0c2a1412ca6a 100644 (file)
--- a/sdk/cwl/arvados_cwl/arvcontainer.py
+++ b/sdk/cwl/arvados_cwl/arvcontainer.py
@@ -437,7 +437,7 @@ class RunnerContainer(Runner):
             command.append("--debug")
 
         if runtimeContext.storage_classes != "default":
-            command.append("--storage-classes=" + runtimeContext.storage_classes
+            command.append("--storage-classes=" + runtimeContext.storage_classes)
 
         if self.on_error:
             command.append("--on-error=" + self.on_error)

diff --git a/sdk/cwl/arvados_cwl/context.py b/sdk/cwl/arvados_cwl/context.py
index 7eeda8bf6582f4270f6a7647b23257f8fa462e84..cf0c1fb7e4576f9ef9f6d0f809e05b47e1186586 100644 (file)
--- a/sdk/cwl/arvados_cwl/context.py
+++ b/sdk/cwl/arvados_cwl/context.py
@@ -23,5 +23,6 @@ class ArvRuntimeContext(RuntimeContext):
         self.submit_runner_image = None
         self.wait = True
         self.cwl_runner_job = None
+        self.storage_classes = "default"
 
         super(ArvRuntimeContext, self).__init__(kwargs)

diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 02b42fefb1326388c03b200dd0b84d62d5ff86d6..8b7e4af81627ac6538783d0e924450ea994d5976 100644 (file)
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -628,7 +628,7 @@ class TestSubmit(unittest.TestCase):
         expect_container["command"] = ['arvados-cwl-runner', '--local', '--api=containers',
                                        '--no-log-timestamps', '--disable-validate',
                                        '--eval-timeout=20', '--thread-count=4',
-                                       '--enable-reuse', "--debug", 
+                                       '--enable-reuse', "--debug",
                                        "--storage-classes=foo", '--on-error=continue',
                                        '/var/lib/cwl/workflow.json#main', '/var/lib/cwl/cwl.input.json']
 
@@ -642,7 +642,7 @@ class TestSubmit(unittest.TestCase):
     @mock.patch("arvados_cwl.ArvCwlRunner.make_output_collection", return_value = (None, None))
     @stubs
     def test_storage_classes_correctly_propagate_to_make_output_collection(self, stubs, make_output, job, tq):
-        def set_final_output(job_order, output_callback, **kwargs):
+        def set_final_output(job_order, output_callback, runtimeContext):
             output_callback("zzzzz-4zz18-zzzzzzzzzzzzzzzz", "success")
             return []
         job.side_effect = set_final_output
@@ -663,14 +663,14 @@ class TestSubmit(unittest.TestCase):
     @mock.patch("arvados_cwl.ArvCwlRunner.make_output_collection", return_value = (None, None))
     @stubs
     def test_default_storage_classes_correctly_propagate_to_make_output_collection(self, stubs, make_output, job, tq):
-        def set_final_output(job_order, output_callback, **kwargs):
+        def set_final_output(job_order, output_callback, runtimeContext):
             output_callback("zzzzz-4zz18-zzzzzzzzzzzzzzzz", "success")
             return []
         job.side_effect = set_final_output
 
         try:
             exited = arvados_cwl.main(
-                ["--debug", "--local", 
+                ["--debug", "--local",
                  "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"],
                 sys.stdin, sys.stderr, api_client=stubs.api, keep_client=stubs.keep_client)
             self.assertEqual(exited, 0)