Demian Brecht
fd211bf490
Add a note about usage of the context manager
...
Addesses #1097
2015-10-02 12:40:58 -07:00
Ronny Pfannschmidt
9263b3a051
Merge pull request #1096 from hackebrot/update-docs-skip-with-cli-option
...
Update docs skip with cli option
2015-10-01 18:31:55 +02:00
holger krekel
88209c6ac6
Merge pull request #1092 from nicoddemus/param-ids-fix
...
Param ids fix
2015-10-01 15:09:11 +02:00
Ronny Pfannschmidt
688f955f5e
Merge pull request #1058 from nicoddemus/doc-how-disable-cache
...
Add docs on how to disable cache provider
2015-10-01 13:06:02 +02:00
Bruno Oliveira
f3cee8f0b5
Merge remote-tracking branch 'upstream/master' into param-ids-fix
2015-10-01 07:58:55 -03:00
Ronny Pfannschmidt
b7fd3f0031
Merge pull request #1093 from nicoddemus/relto-bug
...
Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
Fixes #995
2015-10-01 06:00:40 +02:00
Bruno Oliveira
d1e00f6e19
Detect dynamic code explicitly in filter_traceback
2015-09-30 17:32:49 -03:00
Bruno Oliveira
c9480c5b8b
Move imports outside _escape_bytes as suggested in review
2015-09-30 17:02:19 -03:00
Raphael Pierzina
4829eac1e1
Use a variable for the skipif marker as suggested by @nicoddemus
2015-09-30 21:53:34 +02:00
Raphael Pierzina
a10da0e540
Implement skipif marker for slow test based on pytest.config
2015-09-30 19:41:47 +02:00
Raphael Pierzina
7ac8a88a05
Remove pytest_runtest_setup from conftest.py
2015-09-30 19:25:57 +02:00
Bruno Oliveira
639ae0cfe0
Merge pull request #1095 from ionelmc/fix-hook-docs
...
Correct hook examples in docs.
2015-09-30 11:28:43 -03:00
Ionel Cristian Mărieș
c8f5a40fd9
Edit examples again to use hookimpl.
2015-09-30 16:58:12 +03:00
Ionel Cristian Mărieș
f4f23e8e09
Correct hook examples in docs.
2015-09-30 16:12:33 +03:00
Florian Bruhin
dc9ad12182
Merge pull request #1094 from nicoddemus/cache-fixture-docstring-fix
...
fix docstring for cache fixture regarding ``/`` on keys
2015-09-30 06:02:38 +02:00
Bruno Oliveira
a808e09204
fix docstring for cache fixture regarding ``/`` on keys
2015-09-30 00:27:52 -03:00
Bruno Oliveira
6ae16eba36
add entries for #1085 and #1087 to the CHANGELOG
2015-09-29 22:37:11 -03:00
Bruno Oliveira
11f100813e
Fix internal error when filtering tracebacks where one entry was generated by an exec() statement
...
Fix #995
2015-09-29 22:29:43 -03:00
Bruno Oliveira
b64470443f
Fix SystemError when using unicode_escape on Python 3
...
Fix #1087
2015-09-29 18:20:30 -03:00
Bruno Oliveira
8633c4cefd
Fix encoding errors for parametrized tests with unicode parameters in py2
...
Fix #1085
2015-09-29 17:57:49 -03:00
Florian Bruhin
e9240f7eee
Merge pull request #1090 from RonnyPfannschmidt/fix-flaky-getusertest
...
fix flaky get_user fallback tests
2015-09-29 21:35:45 +02:00
Ronny Pfannschmidt
04deea3c6d
fix flaky get_user fallback tests
2015-09-29 21:00:12 +02:00
Bruno Oliveira
6ca8923ec7
Merge pull request #1088 from hpk42/docfix
...
remove unclear todo that irritates in the online docs
2015-09-29 13:26:54 -03:00
holger krekel
e3562be530
remove unclear todo that irritates in the online docs
2015-09-29 18:23:44 +02:00
holger krekel
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
holger krekel
c5fd42b699
start 2.8.2 development
2015-09-29 15:32:33 +02:00
holger krekel
afdbb6b17a
Merge pull request #1084 from hpk42/branch-281
...
2.8.1 release
2015-09-29 15:19:07 +02:00
holger krekel
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
holger krekel
787c866191
hide some parts from generating latexpdf
2015-09-29 13:37:30 +02:00
holger krekel
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
holger krekel
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
holger krekel
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
Simon Gomizelj
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
Bruno Oliveira
b184f391c6
Show known environment variables in py.test --help
2015-09-28 18:34:16 -03:00
Bruno Oliveira
5f860181b6
Remove print left by accident
2015-09-28 18:25:20 -03:00
Bruno Oliveira
6caa7083db
Moved more detailed options on how to disable a plugin to plugins.rst
2015-09-28 18:23:08 -03:00
holger krekel
839909f3f6
Merge pull request #1081 from hunse/fix-pendingdep
...
`deprecated_call` detects pending warnings again
2015-09-28 19:05:44 +02:00
Eric Hunsberger
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
Eric Hunsberger
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
Ronny Pfannschmidt
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
holger krekel
971ebcbd77
simplify by removing the single-call "exclude_pytest_names" function
2015-09-28 15:43:55 +02:00
holger krekel
03aca9ea79
add changelog entry for fix #1073
2015-09-28 14:17:58 +02:00
holger krekel
1c0ffc5caf
seems like pypy's callable builtin calls __getattr__ so we do the check
...
later.
2015-09-28 14:02:30 +02:00
holger krekel
4e3a807733
fix issue #1073 -- shortcut plugin hook lookup if the attrname is not
...
prefixed with pytest_.
2015-09-28 13:34:28 +02:00
holger krekel
d29084ec2c
add changelog note for fix #704
2015-09-28 11:45:51 +02:00
holger krekel
c5faa00ace
Merge pull request #1077 from nicoddemus/pluggy-0.3.1
...
Vendor pluggy-0.3.1
2015-09-28 11:44:07 +02:00
Bruno Oliveira
910b25d416
Vendor pluggy-0.3.1
...
Fix #704
2015-09-27 16:04:29 -03:00
holger krekel
0c05ca1fd5
Merge branch 'master' into features
2015-09-26 10:03:42 +02:00
Ronny Pfannschmidt
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
Ronny Pfannschmidt
842aa5746f
Merge pull request #1069 from nicoddemus/docs-contents-reorg
...
Reorganize "Contents" page
2015-09-26 09:18:42 +02:00