X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dcb6eaa5012bf1eea607c61209bee18723769c24..e68177bfa8de36bd54f705e16e5c4854eafb29a2:/sdk/cwl/tests/test_container.py diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py index 7dd14a0eb7..455aa286e8 100644 --- a/sdk/cwl/tests/test_container.py +++ b/sdk/cwl/tests/test_container.py @@ -5,6 +5,7 @@ import unittest import os import functools import cwltool.process +from schema_salad.ref_resolver import Loader from schema_salad.ref_resolver import Loader @@ -27,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": [], @@ -71,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 = { @@ -85,6 +86,11 @@ class TestContainer(unittest.TestCase): "coresMin": 3, "ramMin": 3000, "tmpdirMin": 4000 + }, { + "class": "http://arvados.org/cwl#RuntimeConstraints", + "keep_cache": 512 + }, { + "class": "http://arvados.org/cwl#APIRequirement", }], "baseCommand": "ls" } @@ -106,7 +112,8 @@ class TestContainer(unittest.TestCase): 'name': 'test_resource_requirements', 'runtime_constraints': { 'vcpus': 3, - 'ram': 3145728000 + 'ram': 3145728000, + 'API': True }, 'priority': 1, 'mounts': { '/var/spool/cwl': {'kind': 'tmp'}