Merge pull request #2546 from blueyed/better-skip-not-allowed-error

[RFC] Improve error message for CollectError with skip/skipif
pytest-dev · Jul 25, 2017 · 71947cb · 71947cb
2 parents 70d9f86 + 72531f3
commit 71947cb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/_pytest/python.py b/_pytest/python.py
@@ -442,9 +442,10 @@ def _importtestmodule(self):
             if e.allow_module_level:
                 raise
             raise self.CollectError(
-                "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."
+                "Using pytest.skip outside of a test is not allowed. "
+                "To decorate a test function, use the @pytest.mark.skip "
+                "or @pytest.mark.skipif decorators instead, and to skip a "
+                "module use `pytestmark = pytest.mark.{skip,skipif}."
             )
         self.config.pluginmanager.consider_module(mod)
         return mod

diff --git a/changelog/2546.trivial b/changelog/2546.trivial
@@ -0,0 +1 @@
+Improve error message for CollectError with skip/skipif.