🐛 fix(config): start TOML walk from inipath

When pytest resolves config to a subdirectory (e.g. tests_integration/pytest.toml),
rootpath still points to the project root. This caused the parent pyproject.toml
to be found first, ignoring the subdirectory's pytest_env config.

Starting from inipath.parent ensures the walk begins at the directory of the
resolved config file, finding the correct pytest_env section. Falls back to
rootpath when no config file is found.

Author: gaborbernat

src/pytest_env/plugin.py

@@ -61,7 +61,8 @@ def _parse_toml_config(config: dict[str, Any]) -> Generator[Entry, None, None]:
 
 def _load_values(early_config: pytest.Config) -> Iterator[Entry]:
     has_toml = False
-    for path in chain.from_iterable([[early_config.rootpath], early_config.rootpath.parents]):
+    start_path = early_config.inipath.parent if early_config.inipath is not None else early_config.rootpath
+    for path in chain.from_iterable([[start_path], start_path.parents]):
         for pytest_toml_name in ("pytest.toml", ".pytest.toml", "pyproject.toml"):
             pytest_toml_file = path / pytest_toml_name
             if pytest_toml_file.exists():

tests/test_env.py

@@ -220,6 +220,15 @@ def test_env_via_pytest(
             "pytest.toml",
             id="pytest toml over pyproject toml",
         ),
+        pytest.param(
+            {},
+            '[tool.pytest_env]\nMAGIC = "parent"',
+            '[pytest_env]\nMAGIC = "child"',
+            "",
+            {"MAGIC": "child"},
+            "sub/pytest.toml",
+            id="subdir pytest toml over parent pyproject toml",
+        ),
     ],
 )
 def test_env_via_toml(  # noqa: PLR0913, PLR0917
@@ -234,13 +243,21 @@ def test_env_via_toml(  # noqa: PLR0913, PLR0917
 ) -> None:
     tmp_dir = Path(str(testdir.tmpdir))
     test_name = re.sub(r"\W|^(?=\d)", "_", request.node.callspec.id).lower()
-    Path(str(tmp_dir / f"test_{test_name}.py")).symlink_to(Path(__file__).parent / "template.py")
-    if ini:
-        (tmp_dir / "pytest.ini").write_text(ini, encoding="utf-8")
     if pyproject_toml:
         (tmp_dir / "pyproject.toml").write_text(pyproject_toml, encoding="utf-8")
     if pytest_toml and pytest_toml_name:
-        (tmp_dir / pytest_toml_name).write_text(pytest_toml, encoding="utf-8")
+        toml_path = tmp_dir / pytest_toml_name
+        toml_path.parent.mkdir(parents=True, exist_ok=True)
+        toml_path.write_text(pytest_toml, encoding="utf-8")
+
+    if pytest_toml_name and "/" in pytest_toml_name:
+        test_dir = tmp_dir / Path(pytest_toml_name).parent
+    else:
+        test_dir = tmp_dir
+        if ini:
+            (tmp_dir / "pytest.ini").write_text(ini, encoding="utf-8")
+
+    Path(str(test_dir / f"test_{test_name}.py")).symlink_to(Path(__file__).parent / "template.py")
 
     new_env = {
         **env,
@@ -251,7 +268,7 @@ def test_env_via_toml(  # noqa: PLR0913, PLR0917
 
     # monkeypatch persists env variables across parametrized tests, therefore using mock.patch.dict
     with mock.patch.dict(os.environ, new_env, clear=True):
-        result = testdir.runpytest()
+        result = testdir.runpytest(str(test_dir))
 
     result.assert_outcomes(passed=1)