Skip to content

Commit

Permalink
Remove mocking from tests
Browse files Browse the repository at this point in the history
Fixes psf#4275
  • Loading branch information
hauntsaninja committed Mar 20, 2024
1 parent bf11956 commit 5390ae8
Showing 1 changed file with 10 additions and 18 deletions.
28 changes: 10 additions & 18 deletions tests/test_black.py
Original file line number Diff line number Diff line change
Expand Up @@ -474,20 +474,8 @@ def test_false_positive_symlink_output_issue_3384(self) -> None:
# running from CLI, but fails when running the tests because cwd is different
project_root = Path(THIS_DIR / "data" / "nested_gitignore_tests")
working_directory = project_root / "root"
target_abspath = working_directory / "child"
target_contents = list(target_abspath.iterdir())

def mock_n_calls(responses: List[bool]) -> Callable[[], bool]:
def _mocked_calls() -> bool:
if responses:
return responses.pop(0)
return False

return _mocked_calls

with patch("pathlib.Path.iterdir", return_value=target_contents), patch(
"pathlib.Path.resolve", return_value=target_abspath
), patch("pathlib.Path.is_dir", side_effect=mock_n_calls([True])):
with change_directory(working_directory):
# Note that the root folder (project_root) isn't the folder
# named "root" (aka working_directory)
report = MagicMock(verbose=True)
Expand Down Expand Up @@ -2692,11 +2680,15 @@ def test_get_sources_symlink_and_force_exclude(self) -> None:
def test_get_sources_with_stdin_symlink_outside_root(
self,
) -> None:
path = THIS_DIR / "data" / "include_exclude_tests"
stdin_filename = str(path / "b/exclude/a.py")
outside_root_symlink = Path("/target_directory/a.py")
root = Path("target_dir/").resolve().absolute()
with patch("pathlib.Path.resolve", return_value=outside_root_symlink):
with TemporaryDirectory() as tempdir:
tmp = Path(tempdir).resolve()

root = tmp / "root"
root.mkdir()
(root / "pyproject.toml").write_text("[tool.black]", encoding="utf-8")
(root / "a.py").symlink_to(Path("/outside_root/a.py"))

stdin_filename = str(root / "a.py")
assert_collected_sources(
root=root,
src=["-"],
Expand Down

0 comments on commit 5390ae8

Please sign in to comment.