Change format for test function locations

This commit is contained in:
Raphael Pierzina 2016-06-12 15:58:32 +01:00
parent b99aace8a9
commit adc50ac72f
2 changed files with 6 additions and 6 deletions

View File

@ -1253,7 +1253,7 @@ def _show_fixtures_per_test(config, session):
tw.line() tw.line()
tw.sep('-', 'fixtures used by {0}'.format(item.name)) tw.sep('-', 'fixtures used by {0}'.format(item.name))
tw.sep('-', 'from {0}'.format(bestrel)) tw.sep('-', '({0})'.format(bestrel))
for argname, fixture_defs in sorted(name2fixturedefs.items()): for argname, fixture_defs in sorted(name2fixturedefs.items()):
assert fixture_defs is not None assert fixture_defs is not None
if not fixture_defs: if not fixture_defs:

View File

@ -25,7 +25,7 @@ def test_fixtures_in_module(testdir):
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
'*fixtures used by test_arg1*', '*fixtures used by test_arg1*',
'*from test_fixtures_in_module.py:9*', '*(test_fixtures_in_module.py:9)*',
'arg1', 'arg1',
' arg1 docstring', ' arg1 docstring',
]) ])
@ -58,11 +58,11 @@ def test_fixtures_in_conftest(testdir):
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
'*fixtures used by test_arg2*', '*fixtures used by test_arg2*',
'*from test_fixtures_in_conftest.py:2*', '*(test_fixtures_in_conftest.py:2)*',
'arg2', 'arg2',
' arg2 docstring', ' arg2 docstring',
'*fixtures used by test_arg3*', '*fixtures used by test_arg3*',
'*from test_fixtures_in_conftest.py:4*', '*(test_fixtures_in_conftest.py:4)*',
'arg1', 'arg1',
' arg1 docstring', ' arg1 docstring',
'arg2', 'arg2',
@ -96,7 +96,7 @@ def test_should_show_fixtures_used_by_test(testdir):
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
'*fixtures used by test_args*', '*fixtures used by test_args*',
'*from test_should_show_fixtures_used_by_test.py:6*', '*(test_should_show_fixtures_used_by_test.py:6)*',
'arg1', 'arg1',
' arg1 from testmodule', ' arg1 from testmodule',
'arg2', 'arg2',
@ -127,7 +127,7 @@ def test_verbose_include_private_fixtures_and_loc(testdir):
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
'*fixtures used by test_args*', '*fixtures used by test_args*',
'*from test_verbose_include_private_fixtures_and_loc.py:6*', '*(test_verbose_include_private_fixtures_and_loc.py:6)*',
'_arg1 -- conftest.py:3', '_arg1 -- conftest.py:3',
' _arg1 from conftest', ' _arg1 from conftest',
'arg2 -- conftest.py:6', 'arg2 -- conftest.py:6',