Bruno Oliveira
573866bfad
Merge remote-tracking branch 'upstream/features' into issue-1619-conftest-assert-rewrite
2016-06-21 18:10:19 +02:00
Bruno Oliveira
2305d3271d
Merge pull request #1628 from omarkohl/exit_on_collection_error
...
Exit pytest on collection error (without executing tests)
2016-06-21 13:03:21 -03:00
Omar Kohl
ede7478dcc
Exit pytest on collection error (without executing tests)
...
Add --continue-on-collection-errors option to restore the previous behaviour:
Execute tests (that were successfully collected) even when collection errors
happen.
Some tests had to be modified e.g. because the return code changed to 2
(EXIT_INTERRUPTED) instead of 1 (EXIT_TESTSFAILED) because an Interrupted
exception is raised on collection error.
Implemented via pair programming with:
Oleg Pidsadnyi <oleg.pidsadnyi@gmail.com>
closes #1421
2016-06-21 13:32:34 +02:00
Bruno Oliveira
819942e964
Return explicit None from rewrite hook's find_module
2016-06-21 12:28:36 +02:00
Bruno Oliveira
8b0fb47c79
Remove print left by accident
2016-06-21 12:23:12 +02:00
Floris Bruynooghe
9118c0222f
Merge .set_config() into constructor
2016-06-21 09:28:10 +02:00
Bruno Oliveira
e0cb046885
Update AUTHORS and CHANGELOG
2016-06-20 23:16:06 +02:00
Bruno Oliveira
3a81d2e012
conftest files now use assertion rewriting
...
Fix #1619
2016-06-20 23:13:29 +02:00
Florian Bruhin
54872e94b4
Fix test name typo
2016-06-20 18:44:34 +02:00
Florian Bruhin
4f2db6c08d
Merge pull request #1616 from palaviv/pytest.raises-message
...
Pytest.raises custom error message
2016-06-20 18:43:12 +02:00
Ronny Pfannschmidt
f3aead8e49
Merge pull request #1600 from nicoddemus/issue-1599-disable-cap-fixtures
...
Add disabled() method to capsys and capfd
2016-06-20 15:55:54 +02:00
palaviv
f8d4cadc3d
Added versionchanged directives
2016-06-19 23:56:43 +03:00
palaviv
c29130d400
Updated documentation
2016-06-19 23:34:42 +03:00
palaviv
ca093673fb
pytest.raises accept cutom message only when used as context manager
2016-06-19 21:24:47 +03:00
Bruno Oliveira
72bf11cbe9
Add disabled() method to capsys and capfd
...
Fix #1599
2016-06-19 19:14:36 +02:00
palaviv
e6ff01ada3
CR fixes
2016-06-16 21:09:15 +03:00
palaviv
8ddbca36c9
Add CHANGLOG entry
2016-06-16 20:21:03 +03:00
palaviv
d21886c005
pytest.raises accpets custom message
2016-06-16 20:15:32 +03:00
Bruno Oliveira
308396ae3c
Merge pull request #1606 from hackebrot/show-fixtures-per-test
...
Show fixtures per test
2016-06-14 09:54:18 -03:00
Ronny Pfannschmidt
feeee2803e
Merge pull request #1586 from nicoddemus/issue-1461-merge-yield-fixture
...
Make normal fixtures work with "yield"
2016-06-14 10:31:09 +02:00
Raphael Pierzina
adc50ac72f
Change format for test function locations
2016-06-12 15:58:32 +01:00
Raphael Pierzina
b99aace8a9
Fix py26 by using indices in str.format
2016-06-12 00:52:03 +01:00
Raphael Pierzina
bbc6c18448
Add changelog entry for new cli flag
2016-06-12 00:26:32 +01:00
Raphael Pierzina
7eea168106
Implement show_fixtures_per_test and add cli flag
2016-06-12 00:20:06 +01:00
Raphael Pierzina
b47f155d74
Implement tests for --fixtures-per-test
2016-06-12 00:17:50 +01:00
Bruno Oliveira
bdc29968b8
Remove dead code and simplify code in call_fixture_func
2016-06-08 21:07:56 -03:00
Bruno Oliveira
ed69424917
Remove most content from yieldfixture as it is now deprecated
2016-06-08 21:07:55 -03:00
Bruno Oliveira
371fbe4388
Update CHANGELOG (yield statements in normal fixtures)
2016-06-08 21:07:53 -03:00
Bruno Oliveira
fe4f23c1bf
Update docs in prol of using yield statements
2016-06-08 21:07:52 -03:00
Bruno Oliveira
98acda426f
Remove yieldctx variable being passed around
2016-06-08 21:07:50 -03:00
Bruno Oliveira
d712428d33
Fix custom name for yield_fixtures
2016-06-08 21:07:49 -03:00
Bruno Oliveira
366879db27
Make normal fixtures work with "yield"
2016-06-08 21:07:47 -03:00
Bruno Oliveira
92323895c9
Use same python which invoked tox for "doctesting" env
...
This will work for Travis and AppVeyor because both start tox using Python 3
2016-06-08 21:06:19 -03:00
Ronny Pfannschmidt
b5bd4d959d
merge master to features
2016-06-01 08:13:26 +02:00
Ronny Pfannschmidt
f423f08b45
prepare cangelog for the next bugfix release
2016-06-01 08:04:21 +02:00
Ronny Pfannschmidt
5c8b0fb523
fix minor typos
2016-06-01 08:03:22 +02:00
Ronny Pfannschmidt
978bb190a1
add release announcement
2016-05-31 19:06:29 +02:00
Ronny Pfannschmidt
a2a904466c
alter changelog header
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
77c28825df
regendoc and comment out a python2.7 example as per #1573
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
d3dcc2b8f1
bump regendoc python version to 3.5
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
85541113eb
update version
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
7ef06822cb
ignore hypothesis temp folder
2016-05-31 19:05:36 +02:00
Ronny Pfannschmidt
289e0091de
Merge pull request #1577 from pytest-dev/docs-hookwrapper-experimental
...
Remove "experimental" status from hookwrapper
2016-05-31 17:56:08 +02:00
Bruno Oliveira
28efdebfcd
Remove "experimental" status from hookwrapper
2016-05-31 12:17:55 -03:00
Ronny Pfannschmidt
fb2e7cc727
Merge pull request #1575 from hackebrot/fix-showfixtures-for-multiple-fixturedefs
...
Fix showfixtures for multiple fixturedefs
2016-05-31 13:53:13 +02:00
Raphael Pierzina
fb8ad714b1
Implement a test for showfixtures to show fixtures with same name
2016-05-31 11:47:16 +01:00
Raphael Pierzina
945072b89a
Update changelog with --fixtures fix
2016-05-31 11:47:16 +01:00
Raphael Pierzina
0d80a9c729
Change _showfixtures_main to loop over fixturedefs
2016-05-31 11:47:16 +01:00
Ronny Pfannschmidt
357a7c79ef
Merge branch 'tomviner-issue-1496-xfail-cond-kw'
...
fixes #1496
2016-05-31 11:25:15 +02:00
Ronny Pfannschmidt
158f3cfaea
merge master
2016-05-31 11:24:53 +02:00