Bruno Oliveira
7862517c28
Merge pull request #1760 from blueyed/followup-pr1718-remove-newline
...
Followup to #1718 : style/formatting
2016-07-24 13:00:14 -03:00
Tom Viner
42adaf5a61
Fix #1210 display msg for early calls to exit
2016-07-24 14:16:34 +02:00
JJ
4aede6faa6
fixed conflicts
2016-07-24 12:10:32 +02:00
JJ
d000f2536a
added a test for when the indirect is just a string
2016-07-24 10:47:06 +02:00
Edoardo Batini
0ae77be9f0
Add new target links in CHANGELOG
2016-07-24 00:46:06 +02:00
Daniel Hahler
5c5d7e05f7
Followup to #1718 : style/formatting
2016-07-24 00:21:42 +02:00
Edoardo Batini
f450e0a1db
Thanks to Tom Viner for his guidance during EuroPython2016 sprint
2016-07-24 00:06:16 +02:00
Edoardo Batini
fabe8cda2f
Thanking myself in CHANGELOG
2016-07-23 23:59:34 +02:00
Edoardo Batini
3c4158ac35
Add changelog entry for this bugfix branch
2016-07-23 23:51:11 +02:00
Edoardo Batini
e00199212c
Add myself to the AUTHORS
2016-07-23 23:49:44 +02:00
Edoardo Batini
e9a67e6702
Adjust test involving FixtureLookupErrorRepr
...
I added a starting 'E' to the expected error messages.
The tests were still passing after the previous patch but I think it's
better to have stricter tests.
2016-07-23 23:45:07 +02:00
Edoardo Batini
6799a47c78
Start FixtureLookupErrorRepr with an 'E'
2016-07-23 23:43:34 +02:00
Bruno Oliveira
655df7f839
Merge pull request #1755 from diegorusso/master
...
Testcase for overriding autouse fixture with a parametrized fixture.
2016-07-23 12:53:24 -03:00
Bruno Oliveira
9891593413
Merge pull request #1754 from hartym/1749_doctest_report_format
...
Doctest report format option (#1749 )
2016-07-23 12:52:54 -03:00
JJ
bbc7f3a631
updated changelog, resolve #1539
2016-07-23 16:57:49 +02:00
Diego Russo
1704b7d265
Test case for overriding autouse fixtures
...
Test case for overriding autouse fixture with a parametrized fixture.
The test covers the problem explained in the issue 1601
Adding Diego Russo to AUTHORS
2016-07-23 16:53:39 +02:00
JJ
3631719050
added myself to authors
2016-07-23 16:51:55 +02:00
JJ
f26fa5a441
changed error message for unused parametrize name
2016-07-23 16:49:20 +02:00
Romain Dorgueil
94731fc2a1
Changes variable name so it better describes what it does now.
2016-07-23 16:26:33 +02:00
Romain Dorgueil
51fa244650
Cleaner implementation of #1749 .
2016-07-23 16:18:12 +02:00
Romain Dorgueil
d5a70acd48
Simplify test in test_doctest_report_none_or_only_first_failure.
2016-07-23 15:58:13 +02:00
Bruno Oliveira
018acc6bae
Explain why thanks yourself in the CHANGELOG
2016-07-23 10:44:38 -03:00
Romain Dorgueil
f8f690de64
adds the versionadded flag in docs ( #1749 )
2016-07-23 15:30:06 +02:00
Romain Dorgueil
e229a27e8b
using @pytest.mark.parametrize instead of calling one test many times from another as suggested by @nicoddemus in pr #1754
2016-07-23 15:21:59 +02:00
Romain Dorgueil
ec7695e15d
adds a bit of doctest hint on why the key and value getters are separate functions.
2016-07-23 15:19:18 +02:00
Romain Dorgueil
1a33025a76
Refactors test to be in its own class, as discussed with @nicoddemus.
2016-07-23 15:16:23 +02:00
Romain Dorgueil
922a295729
fixes changelog, I think I got it
2016-07-23 15:15:17 +02:00
Romain Dorgueil
014ebc9202
Removed bug reference in changelog because it makes the linting fail.
2016-07-23 15:04:19 +02:00
Romain Dorgueil
87ca4b95fb
Separate the option keys and value to avoid importing "doctest" (and tested things like "logging") for argument parsing ( fixes #1749 )
2016-07-23 14:50:24 +02:00
Romain Dorgueil
fd8e019cc1
Choose the doctest output format in case of failure, still work in progress as a few checks fail (related to #1749 )
2016-07-23 14:40:46 +02:00
Romain Dorgueil
625b603f1f
Implements an option to choose the doctest output format in case of failure. ( fixes #1749 )
2016-07-23 13:06:05 +02:00
Bruno Oliveira
38e0e08074
Merge pull request #1751 from javiromero/docstrings
...
Uppercase first word in docstrings. Change to an imperative form.
2016-07-22 10:33:58 -03:00
Javi Romero
1aab6e3bc2
Add changes to changelog.
2016-07-22 12:54:42 +02:00
Javi Romero
7e37497d5a
Uppercase first word in docstrings. Change to an imperative form. Add name to authors.
2016-07-22 12:39:06 +02:00
Bruno Oliveira
ae0798522f
Merge pull request #1711 from nicoddemus/invocation-scoped-fixtures
...
Invocation scoped fixtures
2016-07-21 19:48:52 -03:00
Florian Bruhin
832ada1b44
Merge pull request #1747 from nicoddemus/line-match-stringio
...
Log LineMatcher output in a stream instead of stderr
2016-07-21 09:38:11 +02:00
Bruno Oliveira
4c112401c5
Log LineMatcher output in a stream instead of stderr
...
This makes the match/nomatch output appear as part
of the fnmatch_lines() error on pytest's output instead
of globbered together with general stdout/stderr capture
2016-07-20 22:35:43 -03:00
Bruno Oliveira
05f3422d7c
Make monkeypatch invocation-scoped
2016-07-20 22:05:49 -03:00
Bruno Oliveira
4f2bf965cb
Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures
2016-07-20 21:16:27 -03:00
Bruno Oliveira
eaa4ee3fdf
Merge pull request #1746 from pytest-dev/conftest-exception-printing
...
Conftest exception printing
2016-07-20 21:03:39 -03:00
Bruno Oliveira
6aea164b6d
Add more tests for invocation scoped fixtures
2016-07-20 21:02:36 -03:00
Bruno Oliveira
20f97c3041
Small documentation improvements
2016-07-20 20:22:28 -03:00
Bruno Oliveira
e0f08a73ab
Merge branch 'features' into conftest-exception-printing
2016-07-20 19:33:36 -03:00
Bruno Oliveira
93aae987a2
Merge pull request #1744 from RonnyPfannschmidt/existfirst-override
...
allow --exitfirst/-x to be overridden by a following --maxfail
2016-07-20 18:16:07 -03:00
Bruno Oliveira
1204cbade4
Merge pull request #1745 from RonnyPfannschmidt/skip-compat
...
skipping plugin: remove python2.5 compat code
2016-07-20 18:14:20 -03:00
Ronny Pfannschmidt
9dadaa8a41
skipping plugin: remove python2.5 compat code
2016-07-20 17:45:20 +02:00
Ronny Pfannschmidt
0403266bf0
record --exitfirst change in changelog
2016-07-20 17:23:07 +02:00
Ronny Pfannschmidt
3fd8257c17
add test for --maxfail=NUM overiding -x
2016-07-20 17:20:10 +02:00
Ronny Pfannschmidt
2a05c311e9
implement exitfirst as store_const option
...
this makes it possible to override with a later maxfail
2016-07-20 17:15:29 +02:00
Bruno Oliveira
bcc58ec916
Merge pull request #1740 from RonnyPfannschmidt/float-argument
...
optparse compatibility - add float and complex
2016-07-19 19:17:35 -03:00