05728d1317
fix keep-duplicates help line.
2016-07-26 09:53:12 +02:00
b4ad4cc46e
Merge pull request #1767 from nicoddemus/merge-master
...
Merge master into features
2016-07-26 08:44:11 +02:00
c2864aba3d
Merge branch 'master' into merge-master
...
# Conflicts:
# AUTHORS
# CHANGELOG.rst
# _pytest/monkeypatch.py
# _pytest/python.py
2016-07-25 19:06:29 -03:00
9cf09cda7b
Remove some comments and improved changelog
2016-07-25 18:41:03 -03:00
eb5b163698
Merge branch '1609-features' of https://github.com/ioggstream/pytest into features
2016-07-25 18:37:55 -03:00
d911bfcb8a
Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest
...
# Conflicts:
# CHANGELOG.rst
2016-07-25 18:26:50 -03:00
8f29ce26e9
Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest
2016-07-25 18:20:17 -03:00
6c8b0a28e1
Add deprecation module to centralize deprecation messages and bits of code
2016-07-25 18:14:39 -03:00
d72afe7e08
Fixed scope override inside metafunc.parametrize. Fixes #634
2016-07-25 12:42:50 +02:00
ab6aef1d1f
feature: default behavior now is to ignore duplicate paths specified from the command line. Use --keep-duplicates to retain duplicate paths.
2016-07-25 12:41:58 +02:00
a2b04d02c2
Merge pull request #1759 from Stranger6667/issue1579-invalid-class
...
Fixed collection of classes with custom ``__new__`` method. Fixes #1579 .
2016-07-25 12:27:51 +02:00
f7ad173fee
Fixed collection of classes with custom ``__new__`` method
2016-07-25 11:33:37 +02:00
d37af20527
Merge pull request #1765 from The-Compiler/1763-cleanup
...
Cleanups for #1763
2016-07-25 10:31:06 +02:00
a309a571d9
Cleanups for #1763
2016-07-25 10:17:46 +02:00
e9d729bd46
drop parenthesis around GH issue number
2016-07-25 10:11:37 +02:00
c9a2e611ce
Merge pull request #1763 from tomviner/issue1210-exit-msg
...
Fix #1210 display msg for early calls to exit
2016-07-24 13:05:44 -03:00
a24146dd3c
Merge pull request #1757 from tramwaj29/improved-message-when-not-using-parametrized-variable
...
Improved message when not using parametrized variable
2016-07-24 13:02:03 -03:00
7862517c28
Merge pull request #1760 from blueyed/followup-pr1718-remove-newline
...
Followup to #1718 : style/formatting
2016-07-24 13:00:14 -03:00
42adaf5a61
Fix #1210 display msg for early calls to exit
2016-07-24 14:16:34 +02:00
4aede6faa6
fixed conflicts
2016-07-24 12:10:32 +02:00
d000f2536a
added a test for when the indirect is just a string
2016-07-24 10:47:06 +02:00
0ae77be9f0
Add new target links in CHANGELOG
2016-07-24 00:46:06 +02:00
5c5d7e05f7
Followup to #1718 : style/formatting
2016-07-24 00:21:42 +02:00
f450e0a1db
Thanks to Tom Viner for his guidance during EuroPython2016 sprint
2016-07-24 00:06:16 +02:00
fabe8cda2f
Thanking myself in CHANGELOG
2016-07-23 23:59:34 +02:00
3c4158ac35
Add changelog entry for this bugfix branch
2016-07-23 23:51:11 +02:00
e00199212c
Add myself to the AUTHORS
2016-07-23 23:49:44 +02:00
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
6799a47c78
Start FixtureLookupErrorRepr with an 'E'
2016-07-23 23:43:34 +02:00
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
9891593413
Merge pull request #1754 from hartym/1749_doctest_report_format
...
Doctest report format option (#1749 )
2016-07-23 12:52:54 -03:00
bbc7f3a631
updated changelog, resolve #1539
2016-07-23 16:57:49 +02:00
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
3631719050
added myself to authors
2016-07-23 16:51:55 +02:00
f26fa5a441
changed error message for unused parametrize name
2016-07-23 16:49:20 +02:00
94731fc2a1
Changes variable name so it better describes what it does now.
2016-07-23 16:26:33 +02:00
51fa244650
Cleaner implementation of #1749 .
2016-07-23 16:18:12 +02:00
d5a70acd48
Simplify test in test_doctest_report_none_or_only_first_failure.
2016-07-23 15:58:13 +02:00
018acc6bae
Explain why thanks yourself in the CHANGELOG
2016-07-23 10:44:38 -03:00
f8f690de64
adds the versionadded flag in docs ( #1749 )
2016-07-23 15:30:06 +02:00
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
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
1a33025a76
Refactors test to be in its own class, as discussed with @nicoddemus.
2016-07-23 15:16:23 +02:00
922a295729
fixes changelog, I think I got it
2016-07-23 15:15:17 +02:00
014ebc9202
Removed bug reference in changelog because it makes the linting fail.
2016-07-23 15:04:19 +02:00
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
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
625b603f1f
Implements an option to choose the doctest output format in case of failure. ( fixes #1749 )
2016-07-23 13:06:05 +02:00
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
1aab6e3bc2
Add changes to changelog.
2016-07-22 12:54:42 +02:00
Roberto Polli
Florian Bruhin
Bruno Oliveira
Dmitry Dygalo
Ronny Pfannschmidt
Florian Bruhin
Edoardo Batini
Tom Viner
JJ
Daniel Hahler
Diego Russo
Romain Dorgueil
Javi Romero