Skip to content

Add pytest.mark.skip shortcut (Issue #607) #1040

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.

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

Closed
wants to merge 35 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
beaa8e5
Fixes #653 use deprecated_call as context_manager
chiller Sep 21, 2015
9f77a85
removed mutation of global state, changed filter addition in Warnings…
chiller Sep 21, 2015
d8fbb0b
start features branch
hpk42 Sep 22, 2015
97f7815
also change pytest version to target 2.9.0
hpk42 Sep 22, 2015
8a4517f
re-add 2.8.x changelog so that MASTER can be merged into features wrt
hpk42 Sep 22, 2015
79587d4
Merge branch 'master' into features
hpk42 Sep 22, 2015
48df2f6
Merge branch 'master' into features
hpk42 Sep 22, 2015
7c088d1
remove nonsense line
hpk42 Sep 22, 2015
36924b5
Merge branch '653-deprecated-context-manager' of https://github.com/c…
RonnyPfannschmidt Sep 22, 2015
4867554
Merge branch 'master' into features
hpk42 Sep 23, 2015
0c05ca1
Merge branch 'master' into features
hpk42 Sep 26, 2015
cb58eaa
Merge remote-tracking branch 'upstream/master' into features
hpk42 Sep 29, 2015
b71add2
Add MarkEvaluator for skip
MichaelAquilina Sep 21, 2015
4e94135
Remove incorrect use of pytest.mark.skip
MichaelAquilina Sep 21, 2015
f144666
Work towards test coverage of mark.skip
MichaelAquilina Sep 21, 2015
ad0b8e3
Fix case where skip is assigned to as an attribute directly
MichaelAquilina Sep 21, 2015
61b8443
Update docs with new skip marker
MichaelAquilina Sep 21, 2015
5ec08d3
Delete trailing whitespace
MichaelAquilina Sep 21, 2015
dc7153e
Spelling and grammar fixes
MichaelAquilina Sep 21, 2015
771aef9
Add a test_skip_class test
MichaelAquilina Sep 21, 2015
abc27f5
Update skipping.rst with correct version marker
MichaelAquilina Sep 23, 2015
d162894
Update skippings tests for better coverage
MichaelAquilina Sep 27, 2015
04545f8
classes inherit from object
MichaelAquilina Oct 1, 2015
eee2413
Fix failing test
MichaelAquilina Oct 1, 2015
1b5aa28
Check no reason displayed if none specified
MichaelAquilina Oct 1, 2015
9e57954
First argument in pytest.mark.skip is a reason
MichaelAquilina Oct 1, 2015
213dbe7
newlines
MichaelAquilina Oct 1, 2015
25d74a5
Dont explicitly inherit from object
MichaelAquilina Oct 3, 2015
5ff9a0f
Remove redundant comments
MichaelAquilina Oct 3, 2015
fc0bd94
Test that "unconditional skip" is the default reason if none given
MichaelAquilina Oct 3, 2015
122980e
Add myself to AUTHORS
MichaelAquilina Oct 3, 2015
00d0c74
Update reason in test to prevent confusing with test_no_reason
MichaelAquilina Oct 3, 2015
df874db
Update default reason to "unconditional skip"
MichaelAquilina Oct 3, 2015
7504429
Add unconditional skip entry to CHANGELOG
MichaelAquilina Oct 3, 2015
8984177
TestXFail also shouldnt explicitly inherit from object
MichaelAquilina Oct 3, 2015
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
Prev Previous commit
Next Next commit
Add a test_skip_class test
  • Loading branch information
MichaelAquilina committed Oct 3, 2015
commit 771aef9ddbd7927e30656aedc20aee5ca9fd8b8d
16 changes: 16 additions & 0 deletions testing/test_skipping.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,22 @@ def test_func():


class TestSkip(object):
def test_skip_class(self, testdir):
testdir.makepyfile("""
import pytest
@pytest.mark.skip
class TestSomething(object):
def test_foo(self):
pass
def test_bar(self):
pass

def test_baz():
pass
""")
rec = testdir.inline_run()
rec.assertoutcome(skipped=2, passed=1)

def test_skip_no_reason(self, testdir):
testdir.makepyfile("""
import pytest
Expand Down