From 281cf5782f0e05133abbd7c66db729bcc52b08e4 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Wed, 12 Jul 2017 17:41:32 -0400 Subject: [PATCH] Revert "Merge branch '11857-acr-default-crunch2'" (edf37e92f885ed4d5bcf587317cc9c6d90d8ece1) refs #11857 Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- sdk/cwl/arvados_cwl/__init__.py | 2 +- sdk/cwl/tests/test_job.py | 2 +- sdk/cwl/tests/test_submit.py | 20 ++++++++++---------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sdk/cwl/arvados_cwl/__init__.py b/sdk/cwl/arvados_cwl/__init__.py index 19ebf7fa2a..52009dadab 100644 --- a/sdk/cwl/arvados_cwl/__init__.py +++ b/sdk/cwl/arvados_cwl/__init__.py @@ -89,7 +89,7 @@ class ArvCwlRunner(object): self.collection_cache = CollectionCache(self.api, self.keep_client, self.num_retries) self.work_api = None - expected_api = ["containers", "jobs"] + expected_api = ["jobs", "containers"] for api in expected_api: try: methods = self.api._rootDesc.get('resources')[api]['methods'] diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py index 89f4677e3b..5d140ba6b9 100644 --- a/sdk/cwl/tests/test_job.py +++ b/sdk/cwl/tests/test_job.py @@ -315,7 +315,7 @@ class TestWorkflow(unittest.TestCase): api._rootDesc = get_rootDesc() runner = arvados_cwl.ArvCwlRunner(api) - runner.work_api = 'jobs' + self.assertEqual(runner.work_api, 'jobs') list_images_in_arv.return_value = [["zzzzz-4zz18-zzzzzzzzzzzzzzz"]] runner.api.collections().get().execute.return_vaulue = {"portable_data_hash": "99999999999999999999999999999993+99"} diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index eec37ef62a..15cdc1e715 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -319,7 +319,7 @@ class TestSubmit(unittest.TestCase): def test_submit_runner_ram(self, stubs, tm): capture_stdout = cStringIO.StringIO() exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", "--debug", "--submit-runner-ram=2048", + ["--submit", "--no-wait", "--debug", "--submit-runner-ram=2048", "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) @@ -338,7 +338,7 @@ class TestSubmit(unittest.TestCase): def test_submit_invalid_runner_ram(self, stubs, tm): capture_stdout = cStringIO.StringIO() exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", "--debug", "--submit-runner-ram=-2048", + ["--submit", "--no-wait", "--debug", "--submit-runner-ram=-2048", "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api) self.assertEqual(exited, 1) @@ -350,7 +350,7 @@ class TestSubmit(unittest.TestCase): capture_stdout = cStringIO.StringIO() exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", "--debug", "--output-name", output_name, + ["--submit", "--no-wait", "--debug", "--output-name", output_name, "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) @@ -369,7 +369,7 @@ class TestSubmit(unittest.TestCase): def test_submit_pipeline_name(self, stubs, tm): capture_stdout = cStringIO.StringIO() exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", "--debug", "--name=hello job 123", + ["--submit", "--no-wait", "--debug", "--name=hello job 123", "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) @@ -389,7 +389,7 @@ class TestSubmit(unittest.TestCase): capture_stdout = cStringIO.StringIO() exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", "--debug", "--output-tags", output_tags, + ["--submit", "--no-wait", "--debug", "--output-tags", output_tags, "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) @@ -408,7 +408,7 @@ class TestSubmit(unittest.TestCase): project_uuid = 'zzzzz-j7d0g-zzzzzzzzzzzzzzz' exited = arvados_cwl.main( - ["--submit", "--no-wait", "--api=jobs", + ["--submit", "--no-wait", "--project-uuid", project_uuid, "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], sys.stdout, sys.stderr, api_client=stubs.api) @@ -424,7 +424,7 @@ class TestSubmit(unittest.TestCase): capture_stdout = cStringIO.StringIO() try: exited = arvados_cwl.main( - ["--submit", "--no-wait", "--debug", + ["--submit", "--no-wait", "--api=containers", "--debug", "tests/wf/submit_wf.cwl", "tests/submit_test_job.json"], capture_stdout, sys.stderr, api_client=stubs.api, keep_client=stubs.keep_client) self.assertEqual(exited, 0) @@ -895,7 +895,7 @@ class TestSubmit(unittest.TestCase): arvados_cwl.runner.arvados_jobs_image(arvrunner, "arvados/jobs:"+arvados_cwl.__version__)) class TestCreateTemplate(unittest.TestCase): - existing_template_uuid = "zzzzz-p5p6p-validworkfloyml" + existing_template_uuid = "zzzzz-d1hrv-validworkfloyml" def _adjust_script_params(self, expect_component): expect_component['script_parameters']['x'] = { @@ -1237,7 +1237,7 @@ class TestTemplateInputs(unittest.TestCase): @stubs def test_inputs_empty(self, stubs): exited = arvados_cwl.main( - ["--create-template", "--api=jobs", + ["--create-template", "tests/wf/inputs_test.cwl", "tests/order/empty_order.json"], cStringIO.StringIO(), sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) @@ -1248,7 +1248,7 @@ class TestTemplateInputs(unittest.TestCase): @stubs def test_inputs(self, stubs): exited = arvados_cwl.main( - ["--create-template", "--api=jobs", + ["--create-template", "tests/wf/inputs_test.cwl", "tests/order/inputs_test_order.json"], cStringIO.StringIO(), sys.stderr, api_client=stubs.api) self.assertEqual(exited, 0) -- 2.30.2