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

fix and test --fixtures location information

This commit is contained in:
holger krekel 2012-10-17 13:12:33 +02:00
parent 20849a44f5
commit 26ab80c4cd
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/python.py
View File

@ -761,7 +761,7 @@ def _showfixtures_main(config, session):
if verbose <= 0 and argname[0] == "_": if verbose <= 0 and argname[0] == "_":
continue continue
if verbose > 0: if verbose > 0:
funcargspec = "%s -- %s" %(argname, loc,) funcargspec = "%s -- %s" %(argname, bestrel,)
else: else:
funcargspec = argname funcargspec = argname
tw.line(funcargspec, green=True) tw.line(funcargspec, green=True)

2
testing/test_python.py
View File

@ -1590,7 +1590,7 @@ class TestShowFixtures:
def test_show_fixtures_verbose(self, testdir): def test_show_fixtures_verbose(self, testdir):
result = testdir.runpytest("--fixtures", "-v") result = testdir.runpytest("--fixtures", "-v")
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
"*tmpdir*", "*tmpdir*--*tmpdir.py*",
"*temporary directory*", "*temporary directory*",
] ]
) )