From a3da8e980ccddf8312cec3e431517c212c964cd7 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Wed, 5 Oct 2016 14:08:52 -0400 Subject: [PATCH] 9307: Bump tests to use v1.0 and make sure that arvados_cwl.add_arv_hints() is called. --- sdk/cwl/tests/test_container.py | 4 ++-- sdk/cwl/tests/test_job.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py index 822a213fe7..455aa286e8 100644 --- a/sdk/cwl/tests/test_container.py +++ b/sdk/cwl/tests/test_container.py @@ -28,7 +28,7 @@ class TestContainer(unittest.TestCase): runner.api.collections().get().execute.return_value = { "portable_data_hash": "99999999999999999999999999999993+99"} - document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3") + document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0") tool = { "inputs": [], @@ -72,7 +72,7 @@ class TestContainer(unittest.TestCase): runner = mock.MagicMock() runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz" runner.ignore_docker_for_reuse = False - document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3") + document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0") keepdocker.return_value = [("zzzzz-4zz18-zzzzzzzzzzzzzz3", "")] runner.api.collections().get().execute.return_value = { diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py index 99e34d3507..db596ca7fa 100644 --- a/sdk/cwl/tests/test_job.py +++ b/sdk/cwl/tests/test_job.py @@ -22,7 +22,7 @@ class TestJob(unittest.TestCase): runner = mock.MagicMock() runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz" runner.ignore_docker_for_reuse = False - document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3") + document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0") tool = { "inputs": [], @@ -70,7 +70,8 @@ class TestJob(unittest.TestCase): runner = mock.MagicMock() runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz" runner.ignore_docker_for_reuse = False - document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3") + arvados_cwl.add_arv_hints() + document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0") tool = { "inputs": [], -- 2.30.2