Merge pull request #54 from George-Ogden/pytester

Allow `conftest` fixtures

Author: George-Ogden

.gitignore

@@ -2,11 +2,14 @@
 tmp.py
 log.txt
 stdout.txt
+out.txt
 stderr.txt
+err.txt
 notes.txt
 TODO
 *.pseudo
 *.patch
+nohup*
 
 ### Python ###
 # Byte-compiled / optimized / DLL files

.mirror.lock

@@ -1,5 +1,5 @@
 # DANGER: EDIT AT YOUR OWN RISK. Track this file in version control so that others can sync files correctly.
-- commit: 4bf378ac9f437becb4c869e3b2b09c8f3adbc074
+- commit: 4519f0a82ab20cd50ec11c717ac75abcff7ea16c
   files:
   - .github/python-release.yaml
   - .github/python-test.yaml

mypy_pytest_plugin/fixture_manager.py

@@ -41,20 +41,24 @@ def resolution_sequence(cls, name: Fullname) -> Iterable[Fullname]:
     @functools.lru_cache
     def default_fixture_module_names(cls) -> Sequence[Fullname]:
         config = _pytest.config.get_config()
-        config.parse(["-s", "--fixtures", "--noconftest"])
+        config.parse(["-s", "--fixtures"])
 
         session = Session.from_config(config)
         fixture_manager = PytestFixtureManager(session)
         return tuple(
             {
-                cls._fixture_module(fixture_defs[-1])
+                module
                 for fixture_defs in fixture_manager._arg2fixturedefs.values()
+                if (module := cls._fixture_module(fixture_defs[-1])) is not None
             }
         )
 
     @classmethod
-    def _fixture_module(cls, fixture: FixtureDef) -> Fullname:
-        return Fullname.from_string(fixture.func.__module__)
+    def _fixture_module(cls, fixture: FixtureDef) -> Fullname | None:
+        module = Fullname.from_string(fixture.func.__module__)
+        if module == Fullname.from_string("conftest"):
+            return None
+        return module
 
     @filter_unique
     def autouse_fixture_names(self, test_module: Fullname) -> Iterable[str]:

mypy_pytest_plugin/fixture_manager_test.py

@@ -72,8 +72,10 @@ def test_fixture_manager_default_fixture_module_names() -> None:
             "_pytest.doctest",
             "_pytest.fixtures",
             "_pytest.junitxml",
+            "_pytest.legacypath",
             "_pytest.logging",
             "_pytest.monkeypatch",
+            "_pytest.pytester",
             "_pytest.recwarn",
             "_pytest.subtests",
             "_pytest.tmpdir",

mypy_pytest_plugin/pytest_config_manager.py

@@ -9,7 +9,7 @@ class PytestConfigManager:
     @functools.cache
     def session(cls) -> Session:
         config = _pytest.config.get_config()
-        config.parse(["-s", "--noconftest"])
+        config.parse(["-s"])
         return Session.from_config(config)
 
     @classmethod

requirements-dev.txt

@@ -1,5 +1,6 @@
 -r requirements.txt
-git+https://github.com/George-Ogden/mirror-rorrim
+git+https://github.com/George-Ogden/mirror-rorrim; python_version >= "3.12"
+git+https://github.com/George-Ogden/mypy-pytest; python_version >= "3.12"
 git+https://github.com/George-Ogden/pytest-dbg
 inline-snapshot
 pip

test_samples/broken_conftest/broken_conftest_test.py

@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.mark.skip
+def test_case() -> int:
+    return 0

test_samples/broken_conftest/conftest.py

@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture
+@pytest.mark.skip
+def fixture_and_mark() -> None: ...

test_samples/conftest.py

@@ -12,11 +12,6 @@ def indirect_int_fixture(base_int_fixture: int) -> int:
     return base_int_fixture + 1
 
 
-@pytest.fixture
-@pytest.mark.skip
-def fixture_and_mark() -> None: ...
-
-
 def missed_fixture_decorator_in_another_file() -> int:
     return 0
 
@@ -41,3 +36,6 @@ def ordered_fixture1() -> Literal[0]:
 @pytest.fixture
 def ordered_fixture2() -> Literal[1]:
     return 1
+
+
+pytest_plugins = "pytester"

test_samples/valid_test.py

@@ -1,5 +1,5 @@
 from typing import Literal
-from pytest import CaptureFixture
+from pytest import CaptureFixture, Pytester
 
 import pytest
 
@@ -38,3 +38,7 @@ def test_iterable_sequence_builtin() -> None:
 
 
 def test_use_builtin_fixture(capsys: CaptureFixture[str]) -> None: ...
+
+
+@pytest.mark.skip
+def test_pytester_fixture(pytester: Pytester) -> None: ...