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

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

Closed
wants to merge 35 commits into from
Closed

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

wants to merge 35 commits into from

Commits on Sep 21, 2015

  1. Fixes pytest-dev#653 use deprecated_call as context_manager

    @chiller
    chiller committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    beaa8e5 View commit details
    Browse the repository at this point in the history

  2. removed mutation of global state, changed filter addition in Warnings… 

    …Recorder
    @chiller
    chiller committed Sep 21, 2015
    Configuration menu
    Copy the full SHA
    9f77a85 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2015

  1. start features branch

    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    d8fbb0b View commit details
    Browse the repository at this point in the history

  2. also change pytest version to target 2.9.0

    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    97f7815 View commit details
    Browse the repository at this point in the history

  3. re-add 2.8.x changelog so that MASTER can be merged into features wrt 

    to the changelog
    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    8a4517f View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into features 

    Conflicts:
	_pytest/__init__.py
    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    79587d4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into features

    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    48df2f6 View commit details
    Browse the repository at this point in the history

  6. remove nonsense line

    @hpk42
    hpk42 committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    7c088d1 View commit details
    Browse the repository at this point in the history

  7. Merge branch '653-deprecated-context-manager' of https://github.com/c… 

    …hiller/pytest into features
    @RonnyPfannschmidt
    RonnyPfannschmidt committed Sep 22, 2015
    Configuration menu
    Copy the full SHA
    36924b5 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2015

  1. Merge branch 'master' into features

    @hpk42
    hpk42 committed Sep 23, 2015
    Configuration menu
    Copy the full SHA
    4867554 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2015

  1. Merge branch 'master' into features

    @hpk42
    hpk42 committed Sep 26, 2015
    Configuration menu
    Copy the full SHA
    0c05ca1 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2015

  1. Merge remote-tracking branch 'upstream/master' into features 

    Conflicts:
	_pytest/__init__.py
	testing/test_recwarn.py
    @hpk42
    hpk42 committed Sep 29, 2015
    Configuration menu
    Copy the full SHA
    cb58eaa View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2015

  1. Add MarkEvaluator for skip

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    b71add2 View commit details
    Browse the repository at this point in the history

  2. Remove incorrect use of pytest.mark.skip

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    4e94135 View commit details
    Browse the repository at this point in the history

  3. Work towards test coverage of mark.skip

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    f144666 View commit details
    Browse the repository at this point in the history

  4. Fix case where skip is assigned to as an attribute directly

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    ad0b8e3 View commit details
    Browse the repository at this point in the history

  5. Update docs with new skip marker

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    61b8443 View commit details
    Browse the repository at this point in the history

  6. Delete trailing whitespace

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    5ec08d3 View commit details
    Browse the repository at this point in the history

  7. Spelling and grammar fixes

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    dc7153e View commit details
    Browse the repository at this point in the history

  8. Add a test_skip_class test

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    771aef9 View commit details
    Browse the repository at this point in the history

  9. Update skipping.rst with correct version marker

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    abc27f5 View commit details
    Browse the repository at this point in the history

  10. Update skippings tests for better coverage

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    d162894 View commit details
    Browse the repository at this point in the history

  11. classes inherit from object

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    04545f8 View commit details
    Browse the repository at this point in the history

  12. Fix failing test

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    eee2413 View commit details
    Browse the repository at this point in the history

  13. Check no reason displayed if none specified

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    1b5aa28 View commit details
    Browse the repository at this point in the history

  14. First argument in pytest.mark.skip is a reason

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    9e57954 View commit details
    Browse the repository at this point in the history

  15. newlines

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    213dbe7 View commit details
    Browse the repository at this point in the history

  16. Dont explicitly inherit from object

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    25d74a5 View commit details
    Browse the repository at this point in the history

  17. Remove redundant comments

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    5ff9a0f View commit details
    Browse the repository at this point in the history

  18. Test that "unconditional skip" is the default reason if none given

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    fc0bd94 View commit details
    Browse the repository at this point in the history

  19. Add myself to AUTHORS

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    122980e View commit details
    Browse the repository at this point in the history

  20. Update reason in test to prevent confusing with test_no_reason

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    00d0c74 View commit details
    Browse the repository at this point in the history

  21. Update default reason to "unconditional skip"

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    df874db View commit details
    Browse the repository at this point in the history

  22. Add unconditional skip entry to CHANGELOG

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    7504429 View commit details
    Browse the repository at this point in the history

  23. TestXFail also shouldnt explicitly inherit from object

    @MichaelAquilina
    MichaelAquilina committed Oct 3, 2015
    Configuration menu
    Copy the full SHA
    8984177 View commit details
    Browse the repository at this point in the history