Skip to content

adding cache_dir to tests #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 15, 2023
Merged

adding cache_dir to tests #704

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions pydra/engine/tests/test_shelltask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2460,14 +2460,14 @@ def test_wf_shell_cmd_3a(plugin, tmp_path):
assert res.output.cp_file.fspath.exists()


def test_wf_shell_cmd_state_1(plugin):
def test_wf_shell_cmd_state_1(plugin, tmp_path):
"""a workflow with 2 tasks and splitter on the wf level,
first one has input with output_file_template (str, uses wf.lzin),
that is passed to the second task
"""
wf = Workflow(name="wf", input_spec=["cmd1", "cmd2", "args"]).split(
"args", args=["newfile_1.txt", "newfile_2.txt"]
)
wf = Workflow(
name="wf", input_spec=["cmd1", "cmd2", "args"], cache_dir=tmp_path
).split("args", args=["newfile_1.txt", "newfile_2.txt"])

wf.inputs.cmd1 = "touch"
wf.inputs.cmd2 = "cp"
Expand Down Expand Up @@ -2820,7 +2820,7 @@ def gather_output(field, output_dir):


@pytest.mark.parametrize("results_function", [result_no_submitter, result_submitter])
def test_shell_cmd_outputspec_5a(plugin, results_function):
def test_shell_cmd_outputspec_5a(plugin, results_function, tmp_path):
"""
customised output_spec, adding files to the output,
using a function to collect output, the function is saved in the field metadata
Expand All @@ -2842,7 +2842,9 @@ def gather_output(executable, output_dir):
],
bases=(ShellOutSpec,),
)
shelly = ShellCommandTask(name="shelly", executable=cmd, output_spec=my_output_spec)
shelly = ShellCommandTask(
name="shelly", executable=cmd, output_spec=my_output_spec, cache_dir=tmp_path
)

res = results_function(shelly, plugin)
assert res.output.stdout == ""
Expand Down Expand Up @@ -2874,7 +2876,7 @@ def gather_output(executable, output_dir, ble):


@pytest.mark.parametrize("results_function", [result_no_submitter, result_submitter])
def test_shell_cmd_outputspec_5c(plugin, results_function):
def test_shell_cmd_outputspec_5c(plugin, results_function, tmp_path):
"""
Customised output spec defined as a class,
using a static function to collect output files.
Expand All @@ -2893,6 +2895,7 @@ def gather_output(executable, output_dir):
name="shelly",
executable=["touch", "newfile_tmp1.txt", "newfile_tmp2.txt"],
output_spec=SpecInfo(name="Output", bases=(MyOutputSpec,)),
cache_dir=tmp_path,
)

res = results_function(shelly, plugin)
Expand Down Expand Up @@ -3177,7 +3180,7 @@ def get_stderr(stderr):
)

shelly = ShellCommandTask(
name="shelly", executable=cmd, output_spec=my_output_spec
name="shelly", executable=cmd, output_spec=my_output_spec, cache_dir=tmp_path
).split("args", args=args)

results = results_function(shelly, plugin)
Expand Down Expand Up @@ -3248,6 +3251,7 @@ def get_lowest_directory(directory_path):
executable=cmd,
output_spec=my_output_spec,
resultsDir="outdir",
cache_dir=tmp_path,
).split("args", args=args)

results_function(shelly, plugin)
Expand Down