[ARVADOS] updated: a3da8e980ccddf8312cec3e431517c212c964cd7

[Git user]

Summary of changes:
 sdk/cwl/tests/test_container.py | 4 ++--
 sdk/cwl/tests/test_job.py       | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

       via  a3da8e980ccddf8312cec3e431517c212c964cd7 (commit)
      from  9486b15595a667742ef541d3f31f78507afea8e7 (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 a3da8e980ccddf8312cec3e431517c212c964cd7
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Oct 5 14:08:52 2016 -0400

    9307: Bump tests to use v1.0 and make sure that arvados_cwl.add_arv_hints() is called.

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index 822a213..455aa28 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 99e34d3..db596ca 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": [],

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


hooks/post-receive
--