Skip to content

Commit

Permalink
Replace all pytest tmpdir fixtures with tmp_path, to avoid deprecated…
Browse files Browse the repository at this point in the history
… legacy_path
  • Loading branch information
hroncok committed Dec 17, 2021
1 parent 53d6683 commit 2c6f6c0
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions tests/test_ipynb.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pathlib
import re

from click.testing import CliRunner
Expand All @@ -12,7 +13,6 @@
import pytest
from black import Mode
from _pytest.monkeypatch import MonkeyPatch
from py.path import local
from tests.util import DATA_DIR

pytestmark = pytest.mark.jupyter
Expand Down Expand Up @@ -371,52 +371,52 @@ def test_ipynb_diff_with_no_change() -> None:


def test_cache_isnt_written_if_no_jupyter_deps_single(
monkeypatch: MonkeyPatch, tmpdir: local
monkeypatch: MonkeyPatch, tmp_path: pathlib.Path
) -> None:
# Check that the cache isn't written to if Jupyter dependencies aren't installed.
jupyter_dependencies_are_installed.cache_clear()
nb = DATA_DIR / "notebook_trailing_newline.ipynb"
tmp_nb = tmpdir / "notebook.ipynb"
tmp_nb = tmp_path / "notebook.ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
monkeypatch.setattr(
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: False
)
result = runner.invoke(main, [str(tmpdir / "notebook.ipynb")])
result = runner.invoke(main, [str(tmp_path / "notebook.ipynb")])
assert "No Python files are present to be formatted. Nothing to do" in result.output
jupyter_dependencies_are_installed.cache_clear()
monkeypatch.setattr(
"black.jupyter_dependencies_are_installed", lambda verbose, quiet: True
)
result = runner.invoke(main, [str(tmpdir / "notebook.ipynb")])
result = runner.invoke(main, [str(tmp_path / "notebook.ipynb")])
assert "reformatted" in result.output


def test_cache_isnt_written_if_no_jupyter_deps_dir(
monkeypatch: MonkeyPatch, tmpdir: local
monkeypatch: MonkeyPatch, tmp_path: pathlib.Path
) -> None:
# Check that the cache isn't written to if Jupyter dependencies aren't installed.
jupyter_dependencies_are_installed.cache_clear()
nb = DATA_DIR / "notebook_trailing_newline.ipynb"
tmp_nb = tmpdir / "notebook.ipynb"
tmp_nb = tmp_path / "notebook.ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
monkeypatch.setattr(
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: False
)
result = runner.invoke(main, [str(tmpdir)])
result = runner.invoke(main, [str(tmp_path)])
assert "No Python files are present to be formatted. Nothing to do" in result.output
jupyter_dependencies_are_installed.cache_clear()
monkeypatch.setattr(
"black.files.jupyter_dependencies_are_installed", lambda verbose, quiet: True
)
result = runner.invoke(main, [str(tmpdir)])
result = runner.invoke(main, [str(tmp_path)])
assert "reformatted" in result.output


def test_ipynb_flag(tmpdir: local) -> None:
def test_ipynb_flag(tmp_path: pathlib.Path) -> None:
nb = DATA_DIR / "notebook_trailing_newline.ipynb"
tmp_nb = tmpdir / "notebook.a_file_extension_which_is_definitely_not_ipynb"
tmp_nb = tmp_path / "notebook.a_file_extension_which_is_definitely_not_ipynb"
with open(nb) as src, open(tmp_nb, "w") as dst:
dst.write(src.read())
result = runner.invoke(
Expand Down

0 comments on commit 2c6f6c0

Please sign in to comment.