ce30896cd2
Also blacklist pytest-capturelog plugin
...
This is the older plugin before pytest-catchlog was around. Apparently there are
people still using it.
Fixes #3004
2017-12-05 20:02:56 +01:00
2e8b0a83fe
Merge pull request #2989 from nicoddemus/bring-tr-writer-back-2984
...
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
2017-12-01 17:42:31 +01:00
369c711f14
Merge pull request #2971 from blueyed/fix-ZeroDivisionError
...
Fix ZeroDivisionError with 0 collected tests
2017-11-30 21:12:46 -02:00
cf0cac3b73
Bring back TerminalReporter.writer as an alias to TerminalReporter._tw
...
Fix #2984
2017-11-30 19:56:47 -02:00
70f1e3b4b0
Improve getscopeitem assertion message
...
Fix #2979
2017-11-30 07:53:43 -02:00
88ed1ab648
Merge pull request #2964 from rpuntaie/master
...
fix issue #2920
2017-11-29 10:32:28 +01:00
191e8c6d9b
Merge pull request #2969 from nicoddemus/null-bytes-2957
...
Always escape null bytes when setting PYTEST_CURRENT_TEST
2017-11-29 06:57:48 +01:00
0f5fb7ed05
Fix ZeroDivisionError with 0 collected tests
...
This can easily happen with pytest-testmon.
2017-11-29 00:54:14 +01:00
89cf943e04
Always escape null bytes when setting PYTEST_CURRENT_TEST
...
Fix #2957
2017-11-28 19:45:13 -02:00
4ea7bbc197
fix issue #2920
2017-11-28 16:47:12 +01:00
796db80ca4
Only escape str-like arguments passed to warnings
...
Fix #2956
2017-11-27 23:17:15 -02:00
4678cbeb91
Merge remote-tracking branch 'upstream/features'
2017-11-27 19:37:58 -02:00
c58715371c
Merge pull request #2954 from blueyed/rewritten
...
Fix spelling: s/re-writ/rewrit/g
2017-11-26 18:12:30 -02:00
d5f038e29a
Fix spelling: s/re-writ/rewrit/g
...
This also fixes "can not" to "cannot" in the "Module already imported so
cannot be rewritten" assertion error.
2017-11-26 20:46:06 +01:00
95de11a44e
Block pytest-catchlog and issue a warning
...
Trying to install pytest-3.3 and pytest-catchlog will result in an
option conflicts because both declare the same options.
2017-11-23 19:53:12 -02:00
05cfdcc8cb
Revert making TerminalWriter public in TerminalReporter plugin
...
We eventually want to replace py.io.TerminalWriter (exposed as
"_tw" in TerminalReporter) by something else, so deprecating access
to "_tw" and making it public as "writer" is contrary to that.
2017-11-23 19:53:12 -02:00
f50ace7c0a
Merge remote-tracking branch 'upstream/master' into release-3.3.0
2017-11-23 20:20:40 +00:00
1d26f3730f
Fix docstrings in pytester
2017-11-22 17:15:59 -02:00
5e71ffab87
Handle marks without description
2017-11-22 15:47:15 +03:00
f05333ab75
Fix rewrite to not write past the edge of the screen
2017-11-22 00:00:02 -02:00
c8d52b633b
Fix assertion rewrite to match module names correctly
...
Fix #2939
2017-11-21 23:06:47 -02:00
3a5dbabf60
Add tests for progress output and docs for ``console_output_style``
...
Fix #2657
2017-11-21 21:01:51 -02:00
3441084bd2
Add progress output for verbose mode with xdist
2017-11-21 21:01:51 -02:00
8b92527d7d
Add re_match_lines and re_match_lines_random to pytester fixture
2017-11-21 21:01:51 -02:00
dab889304e
Implement progress percentage reporting while running tests
...
Fix #2657
2017-11-21 21:01:41 -02:00
219b758949
Add capsysbinary fixture
...
`capsysbinary` works like `capsys` but produces bytes for `readouterr()`.
2017-11-17 09:02:46 -08:00
6161bcff6e
Merge pull request #2925 from asottile/capfdbinary
...
Add capfdbinary fixture
2017-11-17 08:00:10 -02:00
1f08d990d5
Deprecate metafunc.addcall
...
Fix #2876
2017-11-15 15:16:00 -02:00
8f90812481
Add capfdbinary fixture
...
`capfdbinary` works like `capfd` but produces bytes for `readouterr()`.
2017-11-14 14:50:00 -08:00
a6f2d2d2c9
Rename FixtureDef.finalizer to FixtureDef.finalizers
2017-11-12 11:35:46 -02:00
6d3fe0b826
Explicitly clear finalizers list in finalize to ensure cleanup
2017-11-12 11:28:57 -02:00
bdad345f99
Fix passing request to finish() in FixtureDef
2017-11-12 11:28:26 -02:00
f074fd9ac6
Merge remote-tracking branch 'upstream/features' into malinoff/fix-2124
2017-11-12 11:16:08 -02:00
6550b9911b
pytest_fixture_post_finalizer now receives a request argument
2017-11-12 11:14:55 -02:00
258031afe5
Merge remote-tracking branch 'upstream/master' into malinoff/fix-2124
2017-11-12 10:34:47 -02:00
f0f2d2b861
Merge branch 'master' into fix-missing-nodeid-with-pyargs
2017-11-11 14:33:55 +01:00
d1af369800
Merge pull request #2913 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-11-11 10:09:49 +01:00
b671c5a8bf
Merge pull request #2914 from nicoddemus/addfinalizer-refactor
...
Make SubRequest.addfinalizer an explicit method
2017-11-11 09:26:24 +01:00
f320686fe0
Make SubRequest.addfinalizer an explicit method
...
This implicit definition really tripped me while debugging #2127 ,
unfortunately hidden as it was in the middle of all the variable
declarations.
I think the explicit definition is much easier for the eyes and IDEs
to find.
2017-11-11 03:07:34 -02:00
742f9cb825
Merge pull request #2911 from RonnyPfannschmidt/remove-nodeinfo
...
remove unused _pytest.runner.NodeInfo class
2017-11-10 18:57:14 -02:00
983a09a2d4
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-11-10 18:33:02 -02:00
76f3be452a
remove unused _pytest.runner.NodeInfo class
2017-11-10 17:48:52 +01:00
c47dcaa713
switch a special case in scope node lookup to a general one
2017-11-10 17:35:42 +01:00
b11640c1eb
Fix linting E722: do not use bare except
2017-11-04 13:59:10 -02:00
03829fde8a
Fix linting E741: ambiguous variable name
2017-11-04 13:59:10 -02:00
e351976ef4
Merge remote-tracking branch 'upstream/features' into RonnyPfannschmidt/introduce-attrs
2017-11-04 12:32:27 -02:00
b18a9deb4c
Merge pull request #2892 from nicoddemus/merge-master-into-features
...
Merge upstream/master into features
2017-11-04 08:15:28 +01:00
d7e8eeef56
Merge pull request #2878 from RonnyPfannschmidt/collector-makeitem-deprecate
...
deprecate the public internal PyCollector.makeitem method
2017-11-03 17:13:18 -02:00
7d43225c36
Merge pull request #2877 from RonnyPfannschmidt/extract-extract-parameterset
...
move responsibility for parameterset extraction into parameterset class
2017-11-03 16:52:28 -02:00
f3a119c06a
Merge upstream/master into features
2017-11-03 16:37:18 -02:00
Florian Bruhin
Ronny Pfannschmidt
Bruno Oliveira
Florian Bruhin
Daniel Hahler
Roland Puntaier
Sviatoslav Abakumov
Anthony Sottile