jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config: avoid Path.cwd() call in `_set_initial_conftests` 

We should aim to remove all `cwd()` calls except one, otherwise things
will go bad if the working directory changes. Use the invocation dir
instead.
This commit is contained in:
Ran Benita 2024-01-16 20:42:09 +02:00
parent eefc9d47fc
commit 34fafe4c6b
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/_pytest/config/__init__.py
View File

@ -541,6 +541,7 @@ class PytestPluginManager(PluginManager):
noconftest: bool, noconftest: bool,
rootpath: Path, rootpath: Path,
confcutdir: Optional[Path], confcutdir: Optional[Path],
invocation_dir: Path,
importmode: Union[ImportMode, str], importmode: Union[ImportMode, str],
) -> None: ) -> None:
"""Load initial conftest files given a preparsed "namespace". """Load initial conftest files given a preparsed "namespace".
@ -550,8 +551,9 @@ class PytestPluginManager(PluginManager):
All builtin and 3rd party plugins will have been loaded, however, so All builtin and 3rd party plugins will have been loaded, however, so
common options will not confuse our logic here. common options will not confuse our logic here.
""" """
current = Path.cwd() self._confcutdir = (
self._confcutdir = absolutepath(current / confcutdir) if confcutdir else None absolutepath(invocation_dir / confcutdir) if confcutdir else None
)
self._noconftest = noconftest self._noconftest = noconftest
self._using_pyargs = pyargs self._using_pyargs = pyargs
foundanchor = False foundanchor = False
@ -561,7 +563,7 @@ class PytestPluginManager(PluginManager):
i = path.find("::") i = path.find("::")
if i != -1: if i != -1:
path = path[:i] path = path[:i]
anchor = absolutepath(current / path) anchor = absolutepath(invocation_dir / path)
# Ensure we do not break if what appears to be an anchor # Ensure we do not break if what appears to be an anchor
# is in fact a very long option (#10169, #11394). # is in fact a very long option (#10169, #11394).
@ -569,7 +571,7 @@ class PytestPluginManager(PluginManager):
self._try_load_conftest(anchor, importmode, rootpath) self._try_load_conftest(anchor, importmode, rootpath)
foundanchor = True foundanchor = True
if not foundanchor: if not foundanchor:
self._try_load_conftest(current, importmode, rootpath) self._try_load_conftest(invocation_dir, importmode, rootpath)
def _is_in_confcutdir(self, path: Path) -> bool: def _is_in_confcutdir(self, path: Path) -> bool:
"""Whether a path is within the confcutdir. """Whether a path is within the confcutdir.
@ -1168,6 +1170,7 @@ class Config:
noconftest=early_config.known_args_namespace.noconftest, noconftest=early_config.known_args_namespace.noconftest,
rootpath=early_config.rootpath, rootpath=early_config.rootpath,
confcutdir=early_config.known_args_namespace.confcutdir, confcutdir=early_config.known_args_namespace.confcutdir,
invocation_dir=early_config.invocation_params.dir,
importmode=early_config.known_args_namespace.importmode, importmode=early_config.known_args_namespace.importmode,
) )
@ -1261,6 +1264,8 @@ class Config:
"""Decide the args (initial paths/nodeids) to use given the relevant inputs. """Decide the args (initial paths/nodeids) to use given the relevant inputs.
:param warn: Whether can issue warnings. :param warn: Whether can issue warnings.
:returns: The args and the args source. Guaranteed to be non-empty.
""" """
if args: if args:
source = Config.ArgsSource.ARGS source = Config.ArgsSource.ARGS

1
testing/test_conftest.py
View File

@ -35,6 +35,7 @@ def conftest_setinitial(
noconftest=False, noconftest=False,
rootpath=Path(args[0]), rootpath=Path(args[0]),
confcutdir=confcutdir, confcutdir=confcutdir,
invocation_dir=Path.cwd(),
importmode="prepend", importmode="prepend",
) )