projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '10259-cwl-pipeline' closes #10259
[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 6b5c32163ed6901b74ae67d6386cca2f5c1f8f0e..b5499970531008a7474f2ae99fb5de48f1234aa2 100644
(file)
--- a/
sdk/cwl/tests/test_container.py
+++ b/
sdk/cwl/tests/test_container.py
@@
-7,6
+7,8
@@
import functools
import cwltool.process
from schema_salad.ref_resolver import Loader
import cwltool.process
from schema_salad.ref_resolver import Loader
+from schema_salad.ref_resolver import Loader
+
if not os.getenv('ARVADOS_DEBUG'):
logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
logging.getLogger('arvados.arv-run').setLevel(logging.WARN)
if not os.getenv('ARVADOS_DEBUG'):
logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
logging.getLogger('arvados.arv-run').setLevel(logging.WARN)
@@
-26,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": [],
@@
-70,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 = {
@@
-84,6
+86,14
@@
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",
+ }, {
+ "class": "http://arvados.org/cwl#PartitionRequirement",
+ "partition": "blurb"
}],
"baseCommand": "ls"
}
}],
"baseCommand": "ls"
}
@@
-105,7
+115,9
@@
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,
+ 'partition': ['blurb']
}, 'priority': 1,
'mounts': {
'/var/spool/cwl': {'kind': 'tmp'}
}, 'priority': 1,
'mounts': {
'/var/spool/cwl': {'kind': 'tmp'}