Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pytest skip message #1975

Merged
merged 2 commits into from
Oct 1, 2016
Merged

Pytest skip message #1975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57bb3c6
Improve error message when using pytest.skip at module level
Nikratio Sep 27, 2016
336d790
Fix test about pytest.skip message being used at global level
nicoddemus Oct 1, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions _pytest/python.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion testing/test_skipping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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*"
)