diff --git a/test/t/conftest.py b/test/t/conftest.py index 03bde2d6b9c..dbd139df7ca 100644 --- a/test/t/conftest.py +++ b/test/t/conftest.py @@ -947,7 +947,7 @@ def in_container() -> bool: def prepare_fixture_dir( request, files: Iterable[str], dirs: Iterable[str] -) -> Tuple[Path, List[str], List[str]]: +) -> Path: """ Fixture to prepare a test dir with dummy contents on the fly. @@ -961,11 +961,11 @@ def prepare_fixture_dir( old_cwd = os.getcwd() try: os.chdir(tempdir) - new_files, new_dirs = create_dummy_filedirs(files, dirs) + _, _ = create_dummy_filedirs(files, dirs) finally: os.chdir(old_cwd) - return tempdir, new_files, new_dirs + return tempdir def create_dummy_filedirs( diff --git a/test/t/test_man.py b/test/t/test_man.py index bec41de9613..d61a818121d 100644 --- a/test/t/test_man.py +++ b/test/t/test_man.py @@ -24,7 +24,7 @@ def colonpath(self, request, bash): else: pytest.skip("Cygwin doesn't like paths with colons") - tmpdir, _, _ = prepare_fixture_dir( + tmpdir = prepare_fixture_dir( request, files=["man/man3/Bash::Completion.3pm.gz"], dirs=["man", "man/man3"], diff --git a/test/t/test_scp.py b/test/t/test_scp.py index a6701ac7c78..972c345e272 100644 --- a/test/t/test_scp.py +++ b/test/t/test_scp.py @@ -171,7 +171,7 @@ def tmpdir_backslash(self, request, bash): if sys.platform.startswith("win"): pytest.skip("Filenames not allowed on Windows") - tmpdir, _, _ = prepare_fixture_dir( + tmpdir = prepare_fixture_dir( request, files=["local_path-file\\"], dirs=[] ) return tmpdir @@ -192,7 +192,7 @@ def test_remote_path_ending_with_backslash(self, bash): def tmpdir_mkfifo(self, request, bash): # We prepare two files: 1) a named pipe and 2) a regular file ending # with the same name but an extra special character "|". - tmpdir, _, _ = prepare_fixture_dir( + tmpdir = prepare_fixture_dir( request, files=["local_path_2-pipe|"], dirs=[], diff --git a/test/t/test_sshfs.py b/test/t/test_sshfs.py index a530ef477f3..7b8f8009584 100644 --- a/test/t/test_sshfs.py +++ b/test/t/test_sshfs.py @@ -16,7 +16,7 @@ def tmpdir_backslash(self, request, bash): if sys.platform.startswith("win"): pytest.skip("Filenames not allowed on Windows") - tmpdir, _, _ = prepare_fixture_dir( + tmpdir = prepare_fixture_dir( request, files=["local_path-file\\"], dirs=["local_path-dir"] ) return tmpdir diff --git a/test/t/unit/test_unit_load.py b/test/t/unit/test_unit_load.py index 55130414a05..5fcfda2dfe6 100644 --- a/test/t/unit/test_unit_load.py +++ b/test/t/unit/test_unit_load.py @@ -24,7 +24,7 @@ def fixture_dir(self, request, bash): set up symbolic links. """ - tmpdir, _, _ = prepare_fixture_dir(request, files=[], dirs=[]) + tmpdir = prepare_fixture_dir(request, files=[], dirs=[]) assert_bash_exec(bash, "cp -R %s/* %s/" % (os.getcwd(), tmpdir)) assert_bash_exec(bash, "mkdir -p %s/bin" % tmpdir) assert_bash_exec(