p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Pytest skip message
This commit is contained in:
Bruno Oliveira 2016-10-01 14:44:49 -03:00 committed by GitHub
parent a87b1c79c1 336d7900c5
commit fc02003220
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
_pytest/python.py
View File

@ -435,9 +435,9 @@ class Module(pytest.File, PyCollector):
if e.allow_module_level: if e.allow_module_level:
raise raise
raise self.CollectError( raise self.CollectError(
"Using @pytest.skip outside of a test (e.g. as a test " "Using pytest.skip outside of a test is not allowed. If you are "
"function decorator) is not allowed. Use @pytest.mark.skip or " "trying to decorate a test function, use the @pytest.mark.skip "
"@pytest.mark.skipif instead." "or @pytest.mark.skipif decorators instead."
) )
self.config.pluginmanager.consider_module(mod) self.config.pluginmanager.consider_module(mod)
return mod return mod

2
testing/test_skipping.py
View File

@ -967,5 +967,5 @@ def test_module_level_skip_error(testdir):
""") """)
result = testdir.runpytest() result = testdir.runpytest()
result.stdout.fnmatch_lines( result.stdout.fnmatch_lines(
"*Using @pytest.skip outside of a test * is not allowed*" "*Using pytest.skip outside of a test is not allowed*"
) )