b18a9deb4c
Merge pull request #2892 from nicoddemus/merge-master-into-features
...
Merge upstream/master into features
2017-11-04 08:15:28 +01:00
2e2f72156a
Merge pull request #2893 from fmichea/patch-1
...
Clarify language of proposal for fixtures parameters
2017-11-04 08:08:48 +01:00
22e9b006da
Add fragment per PR's guidelines.
2017-11-03 22:24:05 +01:00
802585cb66
Clarify language of proposal for parametrized fixtures
...
This change slightly modifies the language of the proposal document around use of fixture as parameters of pytest.mark.parametrize. When looking for documentation around this, I very quickly scrolled through this document and landed on the last paragraph thinking it was documenting a real function. This change attempts to make it less likely for this to happen.
2017-11-03 22:13:47 +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
e58e8faf47
Add CHANGELOG entry for attrs module dependency
2017-11-03 17:07:33 -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
cd747c48a4
Merge pull request #2874 from nicoddemus/fix-py27-xdist-envs-2843
...
Change directory for py27 xdist-related envs
2017-10-30 17:09:34 +01:00
07b2b18a01
introduce attrs as dependency and use it
...
for FixtureFunctionMarker and marks
2017-10-30 17:04:42 +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
26019b33f8
Merge pull request #2882 from thisch/doctest_lineno
...
Fix context output handling for doctests
2017-10-30 09:57:25 +01:00
cb30848e5a
Merge pull request #2880 from samueldg/capture-result-namedtuple
...
Capture result namedtuple
2017-10-30 09:47:06 +01:00
d00e2da6e9
Merge pull request #2881 from dawran6/2658
...
Document pytest.param
2017-10-30 09:36:33 +01:00
2f993af54a
Fix context output handling for doctests
...
Show full context of doctest source in the pytest output, if the lineno of
failed example in the docstring is < 9.
2017-10-29 20:06:10 +00:00
af5e9238c8
Document pytest.param
...
Append example for pytest.param in the example/parametrize document.
2017-10-28 14:25:09 -07: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
27cea340f3
Remove trailing whitespace
2017-10-26 21:55:28 -02:00
c3ba9225ef
Change directory for py27 xdist-related envs
...
The "filter_traceback" function was not filtering the frames
that belonged to the pytest internals.
"filter_traceback" was receiving *relative* paths when running with
xdist, and full paths in non-distributed runs; for this reason
the traceback function did not consider the received path to be
relative to the pytest internal modules.
Fix #2843
2017-10-26 21:34:41 -02:00
111d640bdb
Merge pull request #2873 from stephenfin/doc/skipping-entire-files
...
doc: Include collector config in the skip doc
2017-10-26 20:21:31 -02:00
734c435d00
Merge pull request #2870 from Perlence/rewrite-python-37-docstring
...
Adapt the Python 3.7 AST changes
2017-10-26 20:15:22 -02:00
27bb2eceb4
Add comment about why we remove docstrings on test_assertrewrite
...
As explained in pytest-dev/pytest#2870
2017-10-26 20:15:05 -02:00
383239cafc
doc: Include collector config in the skip doc
...
None of the decorators are sufficient to skip an entire file, for
example if the file contain invalid code for a given Python version.
Simply link to details about customizing the collector.
Signed-off-by: Stephen Finucane <stephen@that.guru>
2017-10-26 17:14:29 +01:00
fd7bfa30d0
Put imports on the last line unless there are other exprs
2017-10-25 11:05:07 +03:00
3427d27d5a
Try to get docstring from module node
2017-10-25 10:54:43 +03: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
0b540f98b1
Merge pull request #2864 from bilderbuchi/fix-1505
...
Introduce a dedicated section about conftest.py
2017-10-24 20:12:46 -02:00
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
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
52aadcd7c1
Strip whitespace from markers in INI config
...
Resolves #2856 .
2017-10-24 14:18:39 +03: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
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
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
Ronny Pfannschmidt
Franck Michea
Bruno Oliveira
Thomas Hisch
Daw-Ran Liou
Samuel Dion-Girardeau
Stephen Finucane
Sviatoslav Abakumov
Tom Dalton
Florian Bruhin
Christoph Buchner
Pavel Karateev