Merge pull request pytest-dev#1724 from blueyed/followup-pr1718-remov…

…e-newline funcarg_prefix_warning: remove newline
nicoddemus · Jul 13, 2016 · 6e9ee2b · 6e9ee2b
2 parents dd5ce96 + 3cfebdd
commit 6e9ee2b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py
@@ -868,7 +868,7 @@ def yield_fixture(scope="function", params=None, autouse=False, ids=None, name=N
 defaultfuncargprefixmarker = fixture()
 funcarg_prefix_warning = (
     '{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.')
 
 

diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py
@@ -789,7 +789,9 @@ def test_funcarg_prefix(value):
     """)
     result = testdir.runpytest('-ra')
     result.stdout.fnmatch_lines([
-        '*declaring fixtures using "pytest_funcarg__" prefix is deprecated and scheduled to be removed in pytest 4.0*',
-        '*remove the prefix and use the @pytest.fixture decorator instead*',
+        ('WC1 None pytest_funcarg__value: '
+         '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*',
     ])