5ff9a0ff54
Remove redundant comments
2015-10-03 16:59:27 +01:00
25d74a5919
Dont explicitly inherit from object
2015-10-03 16:55:04 +01:00
213dbe7a5f
newlines
2015-10-03 16:42:15 +01:00
9e57954b03
First argument in pytest.mark.skip is a reason
2015-10-03 16:42:15 +01:00
1b5aa2868d
Check no reason displayed if none specified
2015-10-03 16:42:15 +01:00
eee24138b0
Fix failing test
2015-10-03 16:42:15 +01:00
04545f8a54
classes inherit from object
2015-10-03 16:42:15 +01:00
d1628944a6
Update skippings tests for better coverage
2015-10-03 16:42:15 +01:00
abc27f56fc
Update skipping.rst with correct version marker
2015-10-03 16:42:15 +01:00
771aef9ddb
Add a test_skip_class test
2015-10-03 16:42:15 +01:00
dc7153e33c
Spelling and grammar fixes
2015-10-03 16:42:15 +01:00
5ec08d3081
Delete trailing whitespace
2015-10-03 16:42:15 +01:00
61b8443723
Update docs with new skip marker
2015-10-03 16:42:14 +01:00
ad0b8e31b8
Fix case where skip is assigned to as an attribute directly
2015-10-03 16:42:14 +01:00
f144666f8b
Work towards test coverage of mark.skip
2015-10-03 16:42:14 +01:00
4e94135d36
Remove incorrect use of pytest.mark.skip
2015-10-03 16:42:14 +01:00
b71add27da
Add MarkEvaluator for skip
2015-10-03 16:42:14 +01:00
cb58eaa611
Merge remote-tracking branch 'upstream/master' into features
...
Conflicts:
_pytest/__init__.py
testing/test_recwarn.py
2015-09-29 15:56:41 +02:00
c5fd42b699
start 2.8.2 development
2015-09-29 15:32:33 +02:00
afdbb6b17a
Merge pull request #1084 from hpk42/branch-281
...
2.8.1 release
2015-09-29 15:19:07 +02:00
a0076460db
avoid pullrequest picture and fix bugfix/feature target info.
...
I could not get the pullrequest picture to be included correctly
in both latex and html sphinx builders due to the "include" directive
from doc/en/contributing.rst
2015-09-29 13:48:38 +02:00
787c866191
hide some parts from generating latexpdf
2015-09-29 13:37:30 +02:00
95245b935c
- fix a flaky test on py35-xdist by calling
...
importlib.invalidate_caches()
- bump version to 2.8.1
- regen docs
- amend changelog, authors
2015-09-29 13:10:59 +02:00
f61f39efdd
Merge pull request #1052 from The-Compiler/no-std-prefix
...
Don't hardcode 'std' for captured stdout/stderr.
2015-09-29 09:19:40 +02:00
a73d517bee
Merge pull request #1080 from vodik/master
...
fix #1034 : Add missing nodeid on pytest_logwarning call in addhook. Thanks Simon Gomizelj for the PR.
2015-09-29 09:07:43 +02:00
b3727438d6
Add missing nodeid on pytest_logwarning call in addhook.
...
Otherwise KeyError: 'nodeid' gets thrown, killing pytest. This may fix
issue 1034, but the details of it may be caused by something similar
somewhere else.
2015-09-28 20:23:54 -04:00
839909f3f6
Merge pull request #1081 from hunse/fix-pendingdep
...
`deprecated_call` detects pending warnings again
2015-09-28 19:05:44 +02:00
4194c9cce2
Check `deprecated_call` specific to deprecation
...
`deprecated_call` used to accept any warning. As of #897 , it
is now specific to DeprecationWarnings, and another commit in
this PR extends this to PendingDeprecationWarnings. This commit
makes sure this stays the case.
2015-09-28 12:35:24 -04:00
e8261e0c77
`deprecated_call` detects pending warnings again
...
`deprecated_call` now looks for PendingDeprecationWarnings,
as it did previously but was broken by #897 . Fixes #1037 .
Also added a test so this does not happen again.
2015-09-28 12:11:52 -04:00
22e1f4946e
Merge pull request #1079 from hpk42/issue1073
...
fix issue #1073 -- shortcut plugin hook lookup if the attrname is not prefixed with pytest_.
2015-09-28 16:15:42 +02:00
971ebcbd77
simplify by removing the single-call "exclude_pytest_names" function
2015-09-28 15:43:55 +02:00
03aca9ea79
add changelog entry for fix #1073
2015-09-28 14:17:58 +02:00
1c0ffc5caf
seems like pypy's callable builtin calls __getattr__ so we do the check
...
later.
2015-09-28 14:02:30 +02:00
4e3a807733
fix issue #1073 -- shortcut plugin hook lookup if the attrname is not
...
prefixed with pytest_.
2015-09-28 13:34:28 +02:00
d29084ec2c
add changelog note for fix #704
2015-09-28 11:45:51 +02:00
c5faa00ace
Merge pull request #1077 from nicoddemus/pluggy-0.3.1
...
Vendor pluggy-0.3.1
2015-09-28 11:44:07 +02:00
910b25d416
Vendor pluggy-0.3.1
...
Fix #704
2015-09-27 16:04:29 -03:00
0c05ca1fd5
Merge branch 'master' into features
2015-09-26 10:03:42 +02:00
cb4b5bd684
Merge pull request #1072 from nicoddemus/use-more-py35-tox
...
Use py35 as preferred py3 interpreter for special test environments
2015-09-26 09:26:16 +02:00
842aa5746f
Merge pull request #1069 from nicoddemus/docs-contents-reorg
...
Reorganize "Contents" page
2015-09-26 09:18:42 +02:00
c2c2451788
Merge pull request #1071 from nicoddemus/xml-xdist
...
Wrong xml report when used with pytest-xdist
2015-09-26 09:05:25 +02:00
cd7ca3de68
Test py27-xdist and py35 environments on AppVeyor
2015-09-26 03:46:03 -03:00
d52d0251b2
Test py35 on AppVeyor
2015-09-26 03:44:12 -03:00
cdead1a991
Update travis with new tox environments
2015-09-26 03:43:37 -03:00
031a20699c
Use py35 as preferred py3 interpreter for special test environments
2015-09-26 03:37:21 -03:00
e4b18ea5c3
Update CHANGELOG
2015-09-26 03:28:30 -03:00
b72c3310bc
Add note on docs about record_xml_property not working with xdist
2015-09-26 03:24:07 -03:00
748da0e5d7
Fix xml generation when used with pytest-xdist
...
pytest_runtest_logreport must be careful to not depend on setup/call/teardown
being called sequentially in that order, as xdist will call them as they are reported
from the slaves
Fix #1064
2015-09-26 03:21:24 -03:00
bc501a28af
Merge pull request #1070 from oleg-alexandrov/master
...
Documentation clarification
2015-09-26 03:16:44 -03:00
9d2d2d17af
Clarify documentation
...
Fix doc markup
2015-09-25 21:46:06 -07:00
Michael Aquilina
holger krekel
holger krekel
Simon Gomizelj
Eric Hunsberger
Ronny Pfannschmidt
Bruno Oliveira
Oleg Alexandrov