Skip to content
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

Revert "broken symlink as an input the ShellTask" #4

Open
wants to merge 2 commits into
base: skip_symlink_hash
Choose a base branch
from
Open

Revert "broken symlink as an input the ShellTask" #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3793b5
Merge pull request #3 from djarecka/nicolocin-skip_symlink_hash
nicolocin Aug 19, 2020
76b144c
Revert "broken symlink as an input the ShellTask"
nicolocin Aug 19, 2020
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
50 changes: 0 additions & 50 deletions pydra/engine/tests/test_shelltask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,56 +1153,6 @@ def test_shell_cmd_inputspec_9(plugin, results_function, tmpdir):
assert res.output.stdout == "hello from boston"


def test_shell_cmd_inputspec_10_err(tmpdir):
""" checking if the proper error is raised when broken symlink is provided
as a input field with File as a type
"""

file_1 = tmpdir.join("file_1.txt")
with open(file_1, "w") as f:
f.write("hello")
file_2 = tmpdir.join("file_2.txt")

# creating symlink and removing the original file
os.symlink(file_1, file_2)
os.remove(file_1)

cmd_exec = "cat"

my_input_spec = SpecInfo(
name="Input",
fields=[
(
"files",
attr.ib(
type=File,
metadata={
"position": 1,
"argstr": "",
"help_string": "a file",
"mandatory": True,
},
),
)
],
bases=(ShellSpec,),
)

shelly = ShellCommandTask(
name="shelly", executable=cmd_exec, files=file_2, input_spec=my_input_spec
)

# checking if the broken symlink error is raised when checksum is calculated
with pytest.raises(FileNotFoundError) as e:
checksum = shelly.checksum
assert "Broken symlink" in str(e.value)

# checking if the broken symlink error is raised when the task is run
with pytest.raises(FileNotFoundError) as e:
res = shelly()
assert "Broken symlink" in str(e.value)


@pytest.mark.parametrize("results_function", [result_no_submitter, result_submitter])
def test_shell_cmd_inputspec_copyfile_1(plugin, results_function, tmpdir):
""" shelltask changes a file in place,
Expand Down