X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d4a9835195f1c87d6d3436050d55bc60ba031259..b9f912472b42ffffb26da11eaf9b19a825acec47:/sdk/cwl/tests/test_job.py diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py index 46d20485ad..21b72d17db 100644 --- a/sdk/cwl/tests/test_job.py +++ b/sdk/cwl/tests/test_job.py @@ -27,10 +27,10 @@ class TestJob(unittest.TestCase): "baseCommand": "ls", "arguments": [{"valueFrom": "$(runtime.outdir)"}] } - arvtool = arvados_cwl.ArvadosCommandTool(runner, tool, work_api="jobs", avsc_names=avsc_names, basedir="") + make_fs_access=functools.partial(arvados_cwl.CollectionFsAccess, api_client=runner.api) + arvtool = arvados_cwl.ArvadosCommandTool(runner, tool, work_api="jobs", avsc_names=avsc_names, basedir="", make_fs_access=make_fs_access) arvtool.formatgraph = None - for j in arvtool.job({}, mock.MagicMock(), basedir="", - make_fs_access=functools.partial(arvados_cwl.CollectionFsAccess, api_client=runner.api)): + for j in arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access): j.run() runner.api.jobs().create.assert_called_with( body={ @@ -38,7 +38,7 @@ class TestJob(unittest.TestCase): 'runtime_constraints': {}, 'script_parameters': { 'tasks': [{ - 'task.env': {'TMPDIR': '$(task.tmpdir)'}, + 'task.env': {'HOME': '$(task.outdir)', 'TMPDIR': '$(task.tmpdir)'}, 'command': ['ls', '$(task.outdir)'] }], }, @@ -79,9 +79,10 @@ class TestJob(unittest.TestCase): }], "baseCommand": "ls" } - arvtool = arvados_cwl.ArvadosCommandTool(runner, tool, work_api="jobs", avsc_names=avsc_names) + make_fs_access=functools.partial(arvados_cwl.CollectionFsAccess, api_client=runner.api) + arvtool = arvados_cwl.ArvadosCommandTool(runner, tool, work_api="jobs", avsc_names=avsc_names, make_fs_access=make_fs_access) arvtool.formatgraph = None - for j in arvtool.job({}, mock.MagicMock(), basedir=""): + for j in arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access): j.run() runner.api.jobs().create.assert_called_with( body={ @@ -89,7 +90,7 @@ class TestJob(unittest.TestCase): 'runtime_constraints': {}, 'script_parameters': { 'tasks': [{ - 'task.env': {'TMPDIR': '$(task.tmpdir)'}, + 'task.env': {'HOME': '$(task.outdir)', 'TMPDIR': '$(task.tmpdir)'}, 'command': ['ls'] }] },