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

[RFC] Improve error message for CollectError with skip/skipif

Author: nicoddemus

_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

changelog/2546.trivial

@@ -0,0 +1 @@
+Improve error message for CollectError with skip/skipif.