Bruno Oliveira
0b540f98b1
Merge pull request #2864 from bilderbuchi/fix-1505
...
Introduce a dedicated section about conftest.py
2017-10-24 20:12:46 -02:00
Bruno Oliveira
bdab29fa3d
Merge pull request #2867 from Perlence/ini-markers-whitespace
...
Strip whitespace from markers in INI config
2017-10-24 20:11:20 -02:00
Ronny Pfannschmidt
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
Sviatoslav Abakumov
52aadcd7c1
Strip whitespace from markers in INI config
...
Resolves #2856 .
2017-10-24 14:18:39 +03:00
Tom Dalton
f5e72d2f5f
Unused import / lint
2017-10-24 11:25:42 +01:00
Tom Dalton
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
Tom Dalton
14e3a5fcb9
Move the generic separator to a constant
2017-10-24 10:42:16 +01:00
Florian Bruhin
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
Bruno Oliveira
fe560b7192
Make CONTRIBUTING and PR template more consistent regarding doc contributions
2017-10-23 18:46:14 -02:00
Bruno Oliveira
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
Bruno Oliveira
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
Christoph Buchner
e23af009f9
Introduce a dedicated section about conftest.py
...
Also reorganize conftest-related content a bit.
Closes #1505 , closes #1770 .
2017-10-23 22:11:09 +02:00
Florian Bruhin
531e0dcaa3
Merge pull request #2863 from lancelote/patch-1
...
Remove typo @ in assignment
2017-10-23 20:51:07 +02:00
Pavel Karateev
dc5f33ba5c
Remove typo @ in assignment
2017-10-23 21:39:13 +03:00
Tom Dalton
655ab0bf8b
Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/
2017-10-23 17:49:49 +01:00
Tom Dalton
a7199fa8ab
Docstring typo
2017-10-23 16:59:56 +01:00
Tom Dalton
d714c196a5
Shorter code, longer docstring
2017-10-23 16:55:35 +01:00
Tom Dalton
ee7e1c94d2
Remove redundant if, tidy if-body
2017-10-23 16:12:07 +01:00
Tom Dalton
de9d116a49
Added Tom Dalton to AUTHORS
2017-10-23 15:37:15 +01:00
Tom Dalton
f003914d4b
Add changelog entry for #2836
2017-10-23 15:37:02 +01:00
Tom Dalton
1e6dc6f8e5
Working (I think) fix for #2836
2017-10-23 13:26:42 +01:00
Tom Dalton
c03612f729
Test now looks for real expected output
2017-10-23 12:40:32 +01:00
Tom Dalton
29fa9d5bff
Add failing test
2017-10-23 12:28:54 +01:00
Owen Tuz
3cdbb1854f
#2692 : Document setup/teardown behaviour when using unittest-based suites
2017-10-21 23:12:49 +01:00
Bruno Oliveira
4cb60dac3d
Merge pull request #2850 from bilderbuchi/docs-911
...
Add documentation about python -m pytest invocation.
2017-10-18 19:44:52 -02:00
Bruno Oliveira
8c7974af01
Merge pull request #2848 from bilderbuchi/fix-538
...
Clarify the documentation of fixture scopes
2017-10-18 19:18:57 -02:00
Christoph Buchner
46cc9ab77c
Add documentation about python -m pytest invocation.
2017-10-18 21:30:56 +02:00
Florian Bruhin
2d08005039
Merge pull request #2847 from meawoppl/patch-1
...
Spelling Fix
2017-10-18 07:50:43 +02:00
Christoph Buchner
baadd569e8
Clarify the documentation of fixture scopes. Closes #538 .
2017-10-17 23:42:32 +02:00
Matty G
11b391ff49
Update mark.py
2017-10-17 14:11:07 -07:00
Bruno Oliveira
3676da594c
Merge pull request #2841 from pgiraud/patch-1
...
Fix auto-use fixture doc
2017-10-16 21:18:18 -02:00
Pierre GIRAUD
a4fd5cdcb5
Fix auto-use fixture doc
2017-10-16 10:23:35 +02:00
Florian Bruhin
ae4e596b31
Merge pull request #2840 from MarSoft/patch-2
...
Fix typo in parametrization doc
2017-10-16 05:23:12 +02:00
Семён Марьясин
cfdebb3ba4
Fix typo in parametrization doc
2017-10-16 01:55:30 +03:00
Ronny Pfannschmidt
46e30435eb
Merge pull request #2819 from leezu/fix_kwargs_fixtures
...
Fix pytest.parametrize when argnames are specified as kwarg
2017-10-09 06:49:40 +02:00
Leonard Lausen
e86ba41a32
Add testcase for #2819
2017-10-09 01:06:25 +09:00
Leonard Lausen
e89abe6a40
Defensive fallback in case of kwargs not being present
2017-10-09 00:37:27 +09:00
Leonard Lausen
48b5c13f73
Add changelog for #2819
2017-10-08 12:33:02 +09:00
Leonard Lausen
c24ffa3b4c
Fix pytest.parametrize when argnames are specified as kwarg
2017-10-08 12:23:26 +09:00
Ronny Pfannschmidt
761d552814
Merge pull request #2815 from xuanluong/issue-1997-document-xpass
...
Add mention of xpass in skip/xfail documentation
2017-10-06 06:51:35 +02:00
Xuan Luong
4bc6ecb8a5
Add mention of xpass in skip/xfail documentation
2017-10-05 20:14:45 -04:00
Bruno Oliveira
9ee0a1f5c3
Merge pull request #2813 from nicoddemus/release-3.2.3
...
Preparing release version 3.2.3
2017-10-04 17:27:36 -03:00
Bruno Oliveira
6b91bc88de
Preparing release version 3.2.3
2017-10-03 21:42:34 +00:00
Bruno Oliveira
6690b8a444
Merge pull request #2807 from xuanluong/issue-1442-mention-not--k-help
...
[doc] Add example of -k 'not test' in help text
2017-10-01 14:32:34 -03:00
Xuan Luong
7093d8f65e
Add example of -k 'not test' in help text
2017-09-30 18:43:20 -04:00
Bruno Oliveira
966391c77e
Merge pull request #2789 from Avira/master
...
Don't crash if an item has no _fixtureinfo attribute
2017-09-19 17:34:43 -03:00
Bruno Oliveira
9c8847a0cb
Merge pull request #2792 from Avira/fix-tox-docs-link
...
fix tox documentation link
2017-09-19 12:31:21 -03:00
Oliver Bestwalter
58aaabbb10
fix tox documentation link
2017-09-19 16:57:16 +02:00
Oliver Bestwalter
2802135741
fix 'DoctestItem' object has no attribute '_fixtureinfo'
...
* doxtests don't seem to have this attribute, so nothing will be written in that case.
* tried to be a good boy scout and tidied up surrounding code a bit (comments, shadowed/unused names, removed random new lines, naming things)
2017-09-19 12:41:12 +02:00
Ronny Pfannschmidt
bf77daa2ee
Merge pull request #2785 from nicoddemus/py36
...
Change to py36 as main environment for Python 3 environments in tox
2017-09-17 09:19:06 +02:00