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

Merge pull request #1724 from blueyed/followup-pr1718-remove-newline 

funcarg_prefix_warning: remove newline
This commit is contained in:
Bruno Oliveira 2016-07-13 15:46:16 -03:00 committed by GitHub
parent dd5ce96cd7 3cfebdd7c5
commit 6e9ee2b766
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/fixtures.py
View File

@ -868,7 +868,7 @@ def yield_fixture(scope="function", params=None, autouse=False, ids=None, name=N
defaultfuncargprefixmarker = fixture() defaultfuncargprefixmarker = fixture()
funcarg_prefix_warning = ( funcarg_prefix_warning = (
'{name}: declaring fixtures using "pytest_funcarg__" prefix is deprecated ' '{name}: declaring fixtures using "pytest_funcarg__" prefix is deprecated '
'and scheduled to be removed in pytest 4.0.\n' 'and scheduled to be removed in pytest 4.0. '
'Please remove the prefix and use the @pytest.fixture decorator instead.') 'Please remove the prefix and use the @pytest.fixture decorator instead.')

6
testing/acceptance_test.py
View File

@ -789,7 +789,9 @@ def test_funcarg_prefix_deprecation(testdir):
""") """)
result = testdir.runpytest('-ra') result = testdir.runpytest('-ra')
result.stdout.fnmatch_lines([ result.stdout.fnmatch_lines([
'*declaring fixtures using "pytest_funcarg__" prefix is deprecated and scheduled to be removed in pytest 4.0*', ('WC1 None pytest_funcarg__value: '
'*remove the prefix and use the @pytest.fixture decorator instead*', 'declaring fixtures using "pytest_funcarg__" prefix is deprecated '
'and scheduled to be removed in pytest 4.0. '
'Please remove the prefix and use the @pytest.fixture decorator instead.'),
'*1 passed*', '*1 passed*',
]) ])