floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some adjustments to make py.test --basetemp=XYZ work where 

XYZ is a subdir the checkout which contains a conftest.py

--HG--
branch : trunk
This commit is contained in:
holger krekel 2010-06-07 21:02:26 +02:00
parent c1d0fc9aaf
commit 804dcd3521
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
py/_plugin/pytest_pytester.py
View File

@ -347,6 +347,11 @@ class TmpTestdir:
p = py.path.local.make_numbered_dir(prefix="runpytest-", p = py.path.local.make_numbered_dir(prefix="runpytest-",
keep=None, rootdir=self.tmpdir) keep=None, rootdir=self.tmpdir)
args = ('--basetemp=%s' % p, ) + args 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)] plugins = [x for x in self.plugins if isinstance(x, str)]
if plugins: if plugins:
args = ('-p', plugins[0]) + args args = ('-p', plugins[0]) + args

5
testing/test_conftesthandle.py
View File

@ -31,7 +31,8 @@ class TestConftestValueAccessGlobal:
def test_onimport(self, basedir): def test_onimport(self, basedir):
l = [] l = []
conftest = Conftest(onimport=l.append) conftest = Conftest(onimport=l.append)
conftest.setinitial([basedir.join("adir")]) conftest.setinitial([basedir.join("adir"),
'--confcutdir=%s' % basedir])
assert len(l) == 2 assert len(l) == 2
assert conftest.rget("a") == 1 assert conftest.rget("a") == 1
assert conftest.rget("b", basedir.join("adir", "b")) == 2 assert conftest.rget("b", basedir.join("adir", "b")) == 2
@ -145,7 +146,7 @@ def test_setinitial_conftest_subdirs(testdir, name):
sub = testdir.mkdir(name) sub = testdir.mkdir(name)
subconftest = sub.ensure("conftest.py") subconftest = sub.ensure("conftest.py")
conftest = Conftest() conftest = Conftest()
conftest.setinitial([sub.dirpath()]) conftest.setinitial([sub.dirpath(), '--confcutdir=%s' % testdir.tmpdir])
if name != ".dotdir": if name != ".dotdir":
assert subconftest in conftest._conftestpath2mod assert subconftest in conftest._conftestpath2mod
assert len(conftest._conftestpath2mod) == 1 assert len(conftest._conftestpath2mod) == 1