Avoid detecting conftest files upwards from setup.cfg/pytest.ini/tox.ini files by default

As discussed in #82
This commit is contained in:
Bruno Oliveira
2015-07-23 21:48:59 -03:00
parent df29120abe
commit ab9e246ab0
4 changed files with 55 additions and 0 deletions

View File

@@ -894,6 +894,9 @@ class Config(object):
self.warn("I2", "could not load setuptools entry import: %s" % (e,))
self.pluginmanager.consider_env()
self.known_args_namespace = ns = self._parser.parse_known_args(args)
if self.known_args_namespace.confcutdir is None and self.inifile:
confcutdir = py.path.local(self.inifile).dirname
self.known_args_namespace.confcutdir = confcutdir
try:
self.hook.pytest_load_initial_conftests(early_config=self,
args=args, parser=self._parser)