Merge pull request #1975 from nicoddemus/pytest-skip-message

nicoddemus · web-flow · commit fc02003220cc · 2016-10-01T14:44:49.000-03:00
Pytest skip message
diff --git a/_pytest/python.py b/_pytest/python.py
@@ -435,9 +435,9 @@ def _importtestmodule(self):
             if e.allow_module_level:
                 raise
             raise self.CollectError(
-                "Using @pytest.skip outside of a test (e.g. as a test "
-                "function decorator) is not allowed. Use @pytest.mark.skip or "
-                "@pytest.mark.skipif instead."
+                "Using pytest.skip outside of a test is not allowed. If you are "
+                "trying to decorate a test function, use the @pytest.mark.skip "
+                "or @pytest.mark.skipif decorators instead."
             )
         self.config.pluginmanager.consider_module(mod)
         return mod
diff --git a/testing/test_skipping.py b/testing/test_skipping.py
@@ -967,5 +967,5 @@ def test_func():
     """)
     result = testdir.runpytest()
     result.stdout.fnmatch_lines(
-        "*Using @pytest.skip outside of a test * is not allowed*"
+        "*Using pytest.skip outside of a test is not allowed*"
     )

Original file line number	Diff line number	Diff line change
`@@ -967,5 +967,5 @@ def test_func():`
`967`	`967`	`""")`
`968`	`968`	`result = testdir.runpytest()`
`969`	`969`	`result.stdout.fnmatch_lines(`
`970`		`- "Using @pytest.skip outside of a test is not allowed*"`
	`970`	`+ "Using pytest.skip outside of a test is not allowed"`
`971`	`971`	`)`