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
460cae02b0
Small formatting fix in CHANGELOG
2017-11-03 16:51:59 -02:00
f3a119c06a
Merge upstream/master into features
2017-11-03 16:37:18 -02:00
d1aa553f73
add mocked integrationtest for the deprecationwarning of makeitem
2017-10-30 19:49:14 +01:00
766de67392
Fix linting error in deprecated.py
2017-10-30 16:35:34 +01:00
821f9a94d8
deprecate the public internal PyCollector.makeitem method
2017-10-30 16:35:23 +01:00
cb30848e5a
Merge pull request #2880 from samueldg/capture-result-namedtuple
...
Capture result namedtuple
2017-10-30 09:47:06 +01:00
8e178e9f9b
Add myself to AUTHORS list
2017-10-28 15:08:53 -04:00
8e28815d44
Add changelog entry for issue #2879
2017-10-28 15:08:07 -04:00
b27dde24d6
Use a nametuple for `readouterr()` results
...
This allows accessing `out` and `err` directly by attribute,
while preserving tuple unpacking.
Also added tests, one for the `capsys` fixture, and one for the
`MultiCapture` class itself.
2017-10-28 14:53:19 -04:00
4a436f2255
move responsibility for parameterset extraction into parameterset class
2017-10-27 17:55:07 +02:00
def471b975
Merge pull request #2869 from nicoddemus/merge-master-into-features
...
Merge master into features
2017-10-25 09:08:08 +02:00
f743e95cfc
Merge pull request #2791 from OfirOshir/features
...
bugfix for issue #2491
2017-10-25 09:04:01 +02:00
4e581b637f
Use zip and map from six
2017-10-24 22:13:32 -02:00
6b86b0dbfe
Fix additional linting issues
2017-10-24 21:01:00 -02:00
6821d36ca5
Merge remote-tracking branch 'upstream/master' into merge-master-into-features
2017-10-24 19:57:14 -02:00
5631a86296
Merge pull request #2862 from tom-dalton-fanduel/issue-2836-fixture-collection-bug
...
Issue 2836 fixture collection bug
2017-10-24 16:32:50 +02:00
f5e72d2f5f
Unused import / lint
2017-10-24 11:25:42 +01:00
a5ac19cc5e
Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-dalton-fanduel/pytest into issue-2836-fixture-collection-bug
2017-10-24 10:45:06 +01:00
14e3a5fcb9
Move the generic separator to a constant
2017-10-24 10:42:16 +01:00
7b608f976d
Merge pull request #2865 from nicoddemus/contributing-docs
...
Make CONTRIBUTING and PR template more consistent regarding doc contributions
2017-10-24 06:46:32 +02:00
fe560b7192
Make CONTRIBUTING and PR template more consistent regarding doc contributions
2017-10-23 18:46:14 -02:00
b61cbc4fba
Merge pull request #2859 from OwenTuz/issue-2692-document-setup-teardown-mismatch-in-unittest-integration
...
2692.docs document setup/teardown behaviour when using unittest-based su…
2017-10-23 18:35:25 -02:00
a3ec3df0c8
Add E722 and E741 flake errors to the ignore list
...
Also fixed 'E704 multiple statements on one line (def)' in python_api
2017-10-23 18:19:15 -02:00
531e0dcaa3
Merge pull request #2863 from lancelote/patch-1
...
Remove typo @ in assignment
2017-10-23 20:51:07 +02:00
dc5f33ba5c
Remove typo @ in assignment
2017-10-23 21:39:13 +03:00
655ab0bf8b
Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/
2017-10-23 17:49:49 +01:00
a7199fa8ab
Docstring typo
2017-10-23 16:59:56 +01:00
d714c196a5
Shorter code, longer docstring
2017-10-23 16:55:35 +01:00
ee7e1c94d2
Remove redundant if, tidy if-body
2017-10-23 16:12:07 +01:00
de9d116a49
Added Tom Dalton to AUTHORS
2017-10-23 15:37:15 +01:00
f003914d4b
Add changelog entry for #2836
2017-10-23 15:37:02 +01:00
1e6dc6f8e5
Working (I think) fix for #2836
2017-10-23 13:26:42 +01:00
c03612f729
Test now looks for real expected output
2017-10-23 12:40:32 +01:00
29fa9d5bff
Add failing test
2017-10-23 12:28:54 +01:00
3cdbb1854f
#2692 : Document setup/teardown behaviour when using unittest-based suites
2017-10-21 23:12:49 +01:00
083084fcbc
Merge pull request #2842 from ceridwen/features
...
Use funcsigs and inspect.signature to do function argument analysis
2017-10-20 07:49:08 +02:00
f7387e45ea
Fix linting
2017-10-19 21:50:15 -02:00
3da28067f3
Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature
2017-10-19 16:01:26 -07:00
5c71151967
Add more text to the 2.6 and 3.3 announcement
...
The text was a bit short for this important announcement.
2017-10-19 20:48:23 -02:00
3f9f4be070
Merge pull request #2845 from jespino/fix/2832
...
Adding Failed exception to manage maxfail behavior
2017-10-19 09:12:11 +02:00
4cb60dac3d
Merge pull request #2850 from bilderbuchi/docs-911
...
Add documentation about python -m pytest invocation.
2017-10-18 19:44:52 -02:00
8c7974af01
Merge pull request #2848 from bilderbuchi/fix-538
...
Clarify the documentation of fixture scopes
2017-10-18 19:18:57 -02:00
e81b275eda
Update formatting in CHANGELOG
2017-10-18 18:54:44 -02:00
537fc3c315
Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini
...
get PYTEST_ADDOPTS before calling _initini
2017-10-18 18:35:12 -02:00
46cc9ab77c
Add documentation about python -m pytest invocation.
2017-10-18 21:30:56 +02:00
2d08005039
Merge pull request #2847 from meawoppl/patch-1
...
Spelling Fix
2017-10-18 07:50:43 +02:00
baadd569e8
Clarify the documentation of fixture scopes. Closes #538 .
2017-10-17 23:42:32 +02:00
Ronny Pfannschmidt
Bruno Oliveira
Samuel Dion-Girardeau
Tom Dalton
Florian Bruhin
Pavel Karateev
Owen Tuz
Ceridwen
Christoph Buchner