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

funcarg_prefix_warning: remove newline

Author: nicoddemus

_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.')
 
 

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*',
     ])