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

use pyfuncitem name for tmpdir in order to take generative test id into account 

--HG--
branch : trunk
This commit is contained in:
Ronny Pfannschmidt 2010-10-17 00:24:59 +02:00
parent 80778eb3ae
commit 039037701a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pytest/plugin/tmpdir.py
View File

@ -29,6 +29,6 @@ def pytest_funcarg__tmpdir(request):
directory. The returned object is a `py.path.local`_ directory. The returned object is a `py.path.local`_
path object. path object.
""" """
name = request.function.__name__ name = request._pyfuncitem.name
x = request.config.mktemp(name, numbered=True) x = request.config.mktemp(name, numbered=True)
return x.realpath() return x.realpath()

9
testing/plugin/test_tmpdir.py
View File

@ -4,11 +4,16 @@ from pytest.plugin.tmpdir import pytest_funcarg__tmpdir
from pytest.plugin.python import FuncargRequest from pytest.plugin.python import FuncargRequest
def test_funcarg(testdir): def test_funcarg(testdir):
item = testdir.getitem("def test_func(tmpdir): pass") item = testdir.getitem("""
def pytest_generate_tests(metafunc):
metafunc.addcall(id='a')
metafunc.addcall(id='b')
def test_func(tmpdir): pass
""", 'test_func[a]')
p = pytest_funcarg__tmpdir(FuncargRequest(item)) p = pytest_funcarg__tmpdir(FuncargRequest(item))
assert p.check() assert p.check()
bn = p.basename.strip("0123456789") bn = p.basename.strip("0123456789")
assert bn.endswith("test_func") assert bn.endswith("test_func[a]")
def test_ensuretemp(recwarn): def test_ensuretemp(recwarn):
#py.test.deprecated_call(py.test.ensuretemp, 'hello') #py.test.deprecated_call(py.test.ensuretemp, 'hello')