Fix tests refs #13516
authorPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 22 May 2018 23:19:21 +0000 (19:19 -0400)
committerPeter Amstutz <pamstutz@veritasgenetics.com>
Tue, 22 May 2018 23:19:21 +0000 (19:19 -0400)
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

sdk/cwl/arvados_cwl/arvtool.py
sdk/cwl/tests/test_job.py

index 8268300e75b66d6f82b999f649003ec3a0615bbf..fea6adfacc323539d7c2cd595f66d441859893b8 100644 (file)
@@ -39,6 +39,7 @@ class ArvadosCommandTool(CommandLineTool):
         # Workaround for #13365
         builderargs = kwargs.copy()
         builderargs["toplevel"] = True
+        builderargs["tmp_outdir_prefix"] = ""
         builder = self._init_job(joborder, **builderargs)
         joborder = builder.job
 
index 6d2598edaa8e4bdf2894c83a106c171d34fd1937..abf96947eb1b40f21207e0fc9171f66482a0bd47 100644 (file)
@@ -346,7 +346,7 @@ class TestWorkflow(unittest.TestCase):
                                               basedir="", make_fs_access=make_fs_access, loader=document_loader,
                                               makeTool=runner.arv_make_tool, metadata=metadata)
         arvtool.formatgraph = None
-        it = arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access)
+        it = arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access, tmp_outdir_prefix="")
         it.next().run()
         it.next().run()
 
@@ -432,7 +432,7 @@ class TestWorkflow(unittest.TestCase):
                                               basedir="", make_fs_access=make_fs_access, loader=document_loader,
                                               makeTool=runner.arv_make_tool, metadata=metadata)
         arvtool.formatgraph = None
-        it = arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access)
+        it = arvtool.job({}, mock.MagicMock(), basedir="", make_fs_access=make_fs_access, tmp_outdir_prefix="")
         it.next().run()
         it.next().run()