File fix-pytest-mock.patch of Package python3-platformdirs
Index: platformdirs-2.4.0/tests/test_android.py
===================================================================
--- platformdirs-2.4.0.orig/tests/test_android.py
+++ platformdirs-2.4.0/tests/test_android.py
@@ -4,7 +4,7 @@ from unittest.mock import MagicMock
import pytest
from _pytest.monkeypatch import MonkeyPatch
-from pytest_mock import MockerFixture
+from pytest_mock import MockFixture
from platformdirs.android import Android
@@ -26,7 +26,7 @@ from platformdirs.android import Android
"app_name_author_version_false_opinion",
],
)
-def test_android(mocker: MockerFixture, params: Dict[str, Any], func: str) -> None:
+def test_android(mocker: MockFixture, params: Dict[str, Any], func: str) -> None:
mocker.patch("platformdirs.android._android_folder", return_value="/data/data/com.example", autospec=True)
mocker.patch("platformdirs.android.os.path.join", lambda *args: "/".join(args))
result = getattr(Android(**params), func)
@@ -56,7 +56,7 @@ def test_android(mocker: MockerFixture,
assert result == expected
-def test_android_folder_from_jnius(mocker: MockerFixture) -> None:
+def test_android_folder_from_jnius(mocker: MockFixture) -> None:
from platformdirs import PlatformDirs
from platformdirs.android import _android_folder # noqa
@@ -89,7 +89,7 @@ def test_android_folder_from_jnius(mocke
"/data/data/a/files",
],
)
-def test_android_folder_from_sys_path(mocker: MockerFixture, path: str, monkeypatch: MonkeyPatch) -> None:
+def test_android_folder_from_sys_path(mocker: MockFixture, path: str, monkeypatch: MonkeyPatch) -> None:
mocker.patch.dict(sys.modules, {"jnius": MagicMock(autoclass=MagicMock(side_effect=ModuleNotFoundError))})
from platformdirs.android import _android_folder # noqa
@@ -101,7 +101,7 @@ def test_android_folder_from_sys_path(mo
assert result == path[: -len("/files")]
-def test_android_folder_not_found(mocker: MockerFixture, monkeypatch: MonkeyPatch) -> None:
+def test_android_folder_not_found(mocker: MockFixture, monkeypatch: MonkeyPatch) -> None:
mocker.patch.dict(sys.modules, {"jnius": MagicMock(autoclass=MagicMock(side_effect=ModuleNotFoundError))})
from platformdirs.android import _android_folder # noqa
Index: platformdirs-2.4.0/tests/test_unix.py
===================================================================
--- platformdirs-2.4.0.orig/tests/test_unix.py
+++ platformdirs-2.4.0/tests/test_unix.py
@@ -5,19 +5,19 @@ import typing
import pytest
from _pytest.monkeypatch import MonkeyPatch
-from pytest_mock import MockerFixture
+from pytest_mock import MockFixture
from platformdirs.unix import Unix
-def test_user_documents_dir(mocker: MockerFixture) -> None:
+def test_user_documents_dir(mocker: MockFixture) -> None:
example_path = "/home/example/ExampleDocumentsFolder"
mock = mocker.patch("platformdirs.unix._get_user_dirs_folder")
mock.return_value = example_path
assert Unix().user_documents_dir == example_path
-def test_user_documents_dir_env_var(mocker: MockerFixture) -> None:
+def test_user_documents_dir_env_var(mocker: MockFixture) -> None:
# Mock documents dir not being in user-dirs.dirs file
mock = mocker.patch("platformdirs.unix._get_user_dirs_folder")
mock.return_value = None
@@ -28,7 +28,7 @@ def test_user_documents_dir_env_var(mock
assert Unix().user_documents_dir == example_path
-def test_user_documents_dir_default(mocker: MockerFixture) -> None:
+def test_user_documents_dir_default(mocker: MockFixture) -> None:
# Mock documents dir not being in user-dirs.dirs file
mock = mocker.patch("platformdirs.unix._get_user_dirs_folder")
mock.return_value = None
@@ -69,7 +69,7 @@ def dirs_instance() -> Unix:
@pytest.fixture()
-def _getuid(mocker: MockerFixture) -> None:
+def _getuid(mocker: MockFixture) -> None:
mocker.patch("platformdirs.unix.getuid", return_value=1234)