p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,657 Commits 5 Branches 0 Tags 36 MiB
Commit Graph

218 Commits

Author SHA1 Message Date
Bruno Oliveira 030c42203d Fix conflicts in CHANGELOG 2016-08-17 22:58:12 -03:00
Bruno Oliveira 463e6572c5 Merge branch 'master' into merge-master-into-features 
Preparing for 3.0
 2016-08-17 22:39:23 -03:00
Bruno Oliveira 0fb34cd2a1 Update CHANGELOG entries 2016-08-17 21:32:07 -03:00
Florian Bruhin 789e4670e7 Merge pull request #1813 from nicoddemus/pytest-setup.cfg 
Support [tool:pytest] in setup.cfg files
 2016-08-17 20:33:57 +02:00
Florian Bruhin c8ab79402c Merge pull request #1811 from nicoddemus/revert-invocation-fixtures 
Revert invocation-fixtures code
 2016-08-17 20:32:54 +02:00
Bruno Oliveira ab86dea529 Support [tool:pytest] in setup.cfg files 
Also deprecate [pytest] usage in setup.cfg files

Fix #567
 2016-08-17 08:19:38 -03:00
Bruno Oliveira 707b6b5e3f Revert all invocation-fixtures code 
Due to a serious regression found in #1794, it was decided to pull off
invocation features from 3.0 so it can be (hopefully) re-introduced
in 3.1
 2016-08-17 08:12:55 -03:00
Bruno Oliveira f25771a101 Deprecate --resultlog cmdline option 
Fix #830
 2016-08-16 21:40:34 -03:00
Bruno Oliveira 497152505e Add CHANGELOG entry for #1809 2016-08-15 19:31:00 -03:00
Bruno Oliveira ca5957932b Merge pull request #1806 from blueyed/fix-off-by-one-error-with-warnings 
Fix off-by-one error with lines from request.node.warn
 2016-08-15 19:04:00 -03:00
Daniel Hahler c163cc7937 Improve display of continuation lines with multiline errors 
Fixes https://github.com/pytest-dev/pytest/issues/717.
Follow-up to https://github.com/pytest-dev/pytest/pull/1762.
 2016-08-14 22:34:31 +02:00
Daniel Hahler 16cb5d01b1 Fix off-by-one error with lines from request.node.warn 
The line numbers in `node.location` seem to be zero-based?!
 2016-08-14 22:10:01 +02:00
Christian Boelsen c4d9c7ea55 Add thanks as requested. 2016-08-08 13:45:10 +01:00
Christian Boelsen e4028b4505 Fix #1798 to include errors in total tests in junit xml output. 2016-08-08 13:35:49 +01:00
Bruno Oliveira 802755ceed Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2016-08-06 17:58:17 -03:00
Bruno Oliveira 21230aa017 Add CHANGELOG entry 2016-08-06 17:14:13 -03:00
Bruno Oliveira 277b6d3974 Sort fixture names when a fixture lookup error occurs 2016-08-02 19:45:31 -03:00
Bruno Oliveira ea6191a0cd Merge pull request #1779 from RonnyPfannschmidt/deselect-no-reason 
terminal: dont pretend to know the deselection reason
 2016-08-02 08:38:17 -03:00
Ronny Pfannschmidt 1c8fe962f3 add changelog entry 2016-08-02 10:51:10 +02:00
satoru 3c8222f1db Highlight the path of file location in error report 
So that it's more obvious when we need to copy the file path.
 2016-08-01 17:42:20 -03:00
Bruno Oliveira 5565c1f4ae Sort link refs in CHANGELOG 2016-07-26 20:11:49 -03:00
Bruno Oliveira 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
Bruno Oliveira 9cf09cda7b Remove some comments and improved changelog 2016-07-25 18:41:03 -03:00
Bruno Oliveira d911bfcb8a Merge branch 'issue634-scopes' of https://github.com/Stranger6667/pytest 
# Conflicts:
#	CHANGELOG.rst
 2016-07-25 18:26:50 -03:00
Bruno Oliveira 8f29ce26e9 Merge branch 'mark_missing_fixture_error' of https://github.com/eolo999/pytest 2016-07-25 18:20:17 -03:00
Dmitry Dygalo d72afe7e08 Fixed scope override inside metafunc.parametrize. Fixes #634 2016-07-25 12:42:50 +02:00
Roberto Polli 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
Dmitry Dygalo f7ad173fee Fixed collection of classes with custom ``__new__`` method 2016-07-25 11:33:37 +02:00
Florian Bruhin a309a571d9 Cleanups for #1763 2016-07-25 10:17:46 +02:00
Edoardo Batini e9d729bd46 drop parenthesis around GH issue number 2016-07-25 10:11:37 +02:00
Bruno Oliveira 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
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
JJ bbc7f3a631 updated changelog, resolve #1539 2016-07-23 16:57:49 +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 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
Javi Romero 1aab6e3bc2 Add changes to changelog. 2016-07-22 12:54:42 +02:00
Bruno Oliveira 4f2bf965cb Merge remote-tracking branch 'upstream/features' into invocation-scoped-fixtures 2016-07-20 21:16:27 -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
Ronny Pfannschmidt 0403266bf0 record --exitfirst change in changelog 2016-07-20 17:23:07 +02:00
Ronny Pfannschmidt 9af872a230 update changelog 2016-07-19 20:11:47 +02:00
Ronny Pfannschmidt 8a73a2ad60 Merge pull request #1734 from nicoddemus/issue-1728-inconsistent-setup-teardown 
setup_* and teardown_* functions argument now optional
 2016-07-15 14:59:22 +02:00