Skip to content

Commit fe1ab02

Browse files
committed
test(prepare_fixture_dir): Don't return file list
It wasn't used by any of the users of the function
1 parent ab928cd commit fe1ab02

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

test/t/conftest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ def in_container() -> bool:
947947

948948
def prepare_fixture_dir(
949949
request, files: Iterable[str], dirs: Iterable[str]
950-
) -> Tuple[Path, List[str], List[str]]:
950+
) -> Path:
951951
"""
952952
Fixture to prepare a test dir with dummy contents on the fly.
953953
@@ -961,11 +961,11 @@ def prepare_fixture_dir(
961961
old_cwd = os.getcwd()
962962
try:
963963
os.chdir(tempdir)
964-
new_files, new_dirs = create_dummy_filedirs(files, dirs)
964+
_, _ = create_dummy_filedirs(files, dirs)
965965
finally:
966966
os.chdir(old_cwd)
967967

968-
return tempdir, new_files, new_dirs
968+
return tempdir
969969

970970

971971
def create_dummy_filedirs(

test/t/test_man.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def colonpath(self, request, bash):
2424
else:
2525
pytest.skip("Cygwin doesn't like paths with colons")
2626

27-
tmpdir, _, _ = prepare_fixture_dir(
27+
tmpdir = prepare_fixture_dir(
2828
request,
2929
files=["man/man3/Bash::Completion.3pm.gz"],
3030
dirs=["man", "man/man3"],

test/t/test_scp.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ def tmpdir_backslash(self, request, bash):
171171
if sys.platform.startswith("win"):
172172
pytest.skip("Filenames not allowed on Windows")
173173

174-
tmpdir, _, _ = prepare_fixture_dir(
174+
tmpdir = prepare_fixture_dir(
175175
request, files=["local_path-file\\"], dirs=[]
176176
)
177177
return tmpdir
@@ -192,7 +192,7 @@ def test_remote_path_ending_with_backslash(self, bash):
192192
def tmpdir_mkfifo(self, request, bash):
193193
# We prepare two files: 1) a named pipe and 2) a regular file ending
194194
# with the same name but an extra special character "|".
195-
tmpdir, _, _ = prepare_fixture_dir(
195+
tmpdir = prepare_fixture_dir(
196196
request,
197197
files=["local_path_2-pipe|"],
198198
dirs=[],

test/t/test_sshfs.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def tmpdir_backslash(self, request, bash):
1616
if sys.platform.startswith("win"):
1717
pytest.skip("Filenames not allowed on Windows")
1818

19-
tmpdir, _, _ = prepare_fixture_dir(
19+
tmpdir = prepare_fixture_dir(
2020
request, files=["local_path-file\\"], dirs=["local_path-dir"]
2121
)
2222
return tmpdir

test/t/unit/test_unit_load.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def fixture_dir(self, request, bash):
2424
set up symbolic links.
2525
"""
2626

27-
tmpdir, _, _ = prepare_fixture_dir(request, files=[], dirs=[])
27+
tmpdir = prepare_fixture_dir(request, files=[], dirs=[])
2828
assert_bash_exec(bash, "cp -R %s/* %s/" % (os.getcwd(), tmpdir))
2929
assert_bash_exec(bash, "mkdir -p %s/bin" % tmpdir)
3030
assert_bash_exec(

0 commit comments

Comments
 (0)