Skip to content

Commit c9d2635

Browse files
authored
Remove mocking from tests (#4287)
Fixes #4275
1 parent bf11956 commit c9d2635

File tree

1 file changed

+14
-18
lines changed

1 file changed

+14
-18
lines changed

tests/test_black.py

+14-18
Original file line numberDiff line numberDiff line change
@@ -474,20 +474,8 @@ def test_false_positive_symlink_output_issue_3384(self) -> None:
474474
# running from CLI, but fails when running the tests because cwd is different
475475
project_root = Path(THIS_DIR / "data" / "nested_gitignore_tests")
476476
working_directory = project_root / "root"
477-
target_abspath = working_directory / "child"
478-
target_contents = list(target_abspath.iterdir())
479477

480-
def mock_n_calls(responses: List[bool]) -> Callable[[], bool]:
481-
def _mocked_calls() -> bool:
482-
if responses:
483-
return responses.pop(0)
484-
return False
485-
486-
return _mocked_calls
487-
488-
with patch("pathlib.Path.iterdir", return_value=target_contents), patch(
489-
"pathlib.Path.resolve", return_value=target_abspath
490-
), patch("pathlib.Path.is_dir", side_effect=mock_n_calls([True])):
478+
with change_directory(working_directory):
491479
# Note that the root folder (project_root) isn't the folder
492480
# named "root" (aka working_directory)
493481
report = MagicMock(verbose=True)
@@ -2692,11 +2680,19 @@ def test_get_sources_symlink_and_force_exclude(self) -> None:
26922680
def test_get_sources_with_stdin_symlink_outside_root(
26932681
self,
26942682
) -> None:
2695-
path = THIS_DIR / "data" / "include_exclude_tests"
2696-
stdin_filename = str(path / "b/exclude/a.py")
2697-
outside_root_symlink = Path("/target_directory/a.py")
2698-
root = Path("target_dir/").resolve().absolute()
2699-
with patch("pathlib.Path.resolve", return_value=outside_root_symlink):
2683+
with TemporaryDirectory() as tempdir:
2684+
tmp = Path(tempdir).resolve()
2685+
2686+
root = tmp / "root"
2687+
root.mkdir()
2688+
(root / "pyproject.toml").write_text("[tool.black]", encoding="utf-8")
2689+
2690+
target = tmp / "outside_root" / "a.py"
2691+
target.parent.mkdir()
2692+
target.write_text("print('hello')", encoding="utf-8")
2693+
(root / "a.py").symlink_to(target)
2694+
2695+
stdin_filename = str(root / "a.py")
27002696
assert_collected_sources(
27012697
root=root,
27022698
src=["-"],

0 commit comments

Comments
 (0)