p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify basedir isolation

This commit is contained in:
holger krekel 2013-11-21 14:54:46 +01:00
parent 2700a94d49
commit 663f824fc4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
testing/conftest.py
View File

@ -12,6 +12,7 @@ def pytest_addoption(parser):
help=("run FD checks if lsof is available")) help=("run FD checks if lsof is available"))
def pytest_configure(config): def pytest_configure(config):
config._basedir = py.path.local()
if config.getvalue("lsof"): if config.getvalue("lsof"):
try: try:
out = py.process.cmdexec("lsof -p %d" % pid) out = py.process.cmdexec("lsof -p %d" % pid)
@ -42,12 +43,8 @@ def check_open_files(config):
config._numfiles = len(lines2) config._numfiles = len(lines2)
raise AssertionError("\n".join(error)) raise AssertionError("\n".join(error))
@pytest.mark.tryfirst # XXX rather do item.addfinalizer
def pytest_runtest_setup(item):
item._oldir = py.path.local()
def pytest_runtest_teardown(item, __multicall__): def pytest_runtest_teardown(item, __multicall__):
item._oldir.chdir() item.config._basedir.chdir()
if hasattr(item.config, '_numfiles'): if hasattr(item.config, '_numfiles'):
x = __multicall__.execute() x = __multicall__.execute()
check_open_files(item.config) check_open_files(item.config)