projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8442: Fix message
[arvados.git]
/
sdk
/
cwl
/
tests
/
test_job.py
diff --git
a/sdk/cwl/tests/test_job.py
b/sdk/cwl/tests/test_job.py
index e74e000b60afca6a7665814898e2ac3621c82fe2..dba65b0f8a884c207c29656d9f5d0107479f0b7a 100644
(file)
--- a/
sdk/cwl/tests/test_job.py
+++ b/
sdk/cwl/tests/test_job.py
@@
-3,6
+3,7
@@
import logging
import mock
import unittest
import os
import mock
import unittest
import os
+import cwltool.process
if not os.getenv('ARVADOS_DEBUG'):
logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
if not os.getenv('ARVADOS_DEBUG'):
logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
@@
-17,15
+18,16
@@
class TestJob(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")
tool = {
"inputs": [],
"outputs": [],
"baseCommand": "ls"
}
tool = {
"inputs": [],
"outputs": [],
"baseCommand": "ls"
}
- arvtool = arvados_cwl.ArvadosCommandTool(runner, tool)
+ arvtool = arvados_cwl.ArvadosCommandTool(runner, tool
, avsc_names=avsc_names, basedir=""
)
arvtool.formatgraph = None
arvtool.formatgraph = None
- for j in arvtool.job({},
"", mock.MagicMock()
):
+ for j in arvtool.job({},
mock.MagicMock(), basedir=""
):
j.run()
runner.api.jobs().create.assert_called_with(
body={
j.run()
runner.api.jobs().create.assert_called_with(
body={
@@
-61,6
+63,7
@@
class TestJob(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")
tool = {
"inputs": [],
tool = {
"inputs": [],
@@
-73,9
+76,9
@@
class TestJob(unittest.TestCase):
}],
"baseCommand": "ls"
}
}],
"baseCommand": "ls"
}
- arvtool = arvados_cwl.ArvadosCommandTool(runner, tool)
+ arvtool = arvados_cwl.ArvadosCommandTool(runner, tool
, avsc_names=avsc_names
)
arvtool.formatgraph = None
arvtool.formatgraph = None
- for j in arvtool.job({},
"", mock.MagicMock()
):
+ for j in arvtool.job({},
mock.MagicMock(), basedir=""
):
j.run()
runner.api.jobs().create.assert_called_with(
body={
j.run()
runner.api.jobs().create.assert_called_with(
body={