projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 9307-cwl-use-tmp-output
[arvados.git]
/
sdk
/
cwl
/
tests
/
test_container.py
diff --git
a/sdk/cwl/tests/test_container.py
b/sdk/cwl/tests/test_container.py
index 7d941cf8fc7c5d5f1caf04d5b60a8aa2b67c1019..455aa286e8bbb1f9126219933d675359963ca2ce 100644
(file)
--- 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"}
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": [],
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
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 = {
keepdocker.return_value = [("zzzzz-4zz18-zzzzzzzzzzzzzz3", "")]
runner.api.collections().get().execute.return_value = {
@@
-86,6
+86,11
@@
class TestContainer(unittest.TestCase):
"coresMin": 3,
"ramMin": 3000,
"tmpdirMin": 4000
"coresMin": 3,
"ramMin": 3000,
"tmpdirMin": 4000
+ }, {
+ "class": "http://arvados.org/cwl#RuntimeConstraints",
+ "keep_cache": 512
+ }, {
+ "class": "http://arvados.org/cwl#APIRequirement",
}],
"baseCommand": "ls"
}
}],
"baseCommand": "ls"
}
@@
-107,7
+112,8
@@
class TestContainer(unittest.TestCase):
'name': 'test_resource_requirements',
'runtime_constraints': {
'vcpus': 3,
'name': 'test_resource_requirements',
'runtime_constraints': {
'vcpus': 3,
- 'ram': 3145728000
+ 'ram': 3145728000,
+ 'API': True
}, 'priority': 1,
'mounts': {
'/var/spool/cwl': {'kind': 'tmp'}
}, 'priority': 1,
'mounts': {
'/var/spool/cwl': {'kind': 'tmp'}