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

Pytest skip message
nicoddemus · Oct 1, 2016 · fc02003 · fc02003
2 parents a87b1c7 + 336d790
commit fc02003
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
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*"
  )