diff --git a/py/_plugin/pytest_pytester.py b/py/_plugin/pytest_pytester.py index bb6790d75..ccde0856f 100644 --- a/py/_plugin/pytest_pytester.py +++ b/py/_plugin/pytest_pytester.py @@ -347,6 +347,11 @@ class TmpTestdir: p = py.path.local.make_numbered_dir(prefix="runpytest-", keep=None, rootdir=self.tmpdir) args = ('--basetemp=%s' % p, ) + args + for x in args: + if '--confcutdir' in str(x): + break + else: + args = ('--confcutdir=.',) + args plugins = [x for x in self.plugins if isinstance(x, str)] if plugins: args = ('-p', plugins[0]) + args diff --git a/testing/test_conftesthandle.py b/testing/test_conftesthandle.py index 0eb8066b0..65ee13504 100644 --- a/testing/test_conftesthandle.py +++ b/testing/test_conftesthandle.py @@ -31,7 +31,8 @@ class TestConftestValueAccessGlobal: def test_onimport(self, basedir): l = [] conftest = Conftest(onimport=l.append) - conftest.setinitial([basedir.join("adir")]) + conftest.setinitial([basedir.join("adir"), + '--confcutdir=%s' % basedir]) assert len(l) == 2 assert conftest.rget("a") == 1 assert conftest.rget("b", basedir.join("adir", "b")) == 2 @@ -145,7 +146,7 @@ def test_setinitial_conftest_subdirs(testdir, name): sub = testdir.mkdir(name) subconftest = sub.ensure("conftest.py") conftest = Conftest() - conftest.setinitial([sub.dirpath()]) + conftest.setinitial([sub.dirpath(), '--confcutdir=%s' % testdir.tmpdir]) if name != ".dotdir": assert subconftest in conftest._conftestpath2mod assert len(conftest._conftestpath2mod) == 1