jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
5,769 Commits 2 Branches 0 Tags 34 MiB
Commit Graph

5769 Commits

Author SHA1 Message Date
matthiasha 3455dfc804 add missing @matthiasha link 2016-08-19 14:01:07 +02:00
matthiasha cd39cc1eec Mention doc update in CHANGELOG 2016-08-19 09:08:11 +02:00
matthiasha ccfa8d15bf Update AUTHORS 2016-08-19 09:04:19 +02:00
matthiasha 799dab9dba Documentation update for rootdir discovery 
This covers issue https://github.com/pytest-dev/pytest/issues/1435.
 2016-08-19 09:01:12 +02:00
Bruno Oliveira c74ce371ab Add release announcement 2016-08-18 12:02:01 -04:00
Bruno Oliveira 7f18367582 Finalize CHANGELOG 2016-08-18 11:43:21 -04:00
Bruno Oliveira a3e6c14da3 Bump version to 3.0.0 2016-08-18 11:41:10 -04:00
Florian Bruhin be9356aeba Merge pull request #1817 from nicoddemus/regendoc-run 
Run regendoc for 3.0 release
 2016-08-18 15:31:03 +02:00
Bruno Oliveira 9ce30e0085 Run regendoc for 3.0 release 2016-08-18 08:27:16 -04:00
Bruno Oliveira 3748112a94 Merge pull request #1816 from nicoddemus/merge-master-into-features 
Merge master into features
 2016-08-18 08:48:01 -03:00
Bruno Oliveira 0334e75c30 Use "pytest" instead of "py.test" on trial environments 2016-08-18 08:37:55 -03:00
Bruno Oliveira 56df9fcc72 Tweak CHANGELOG: move "change" entry to the proper place 2016-08-17 23:08:13 -03:00
Bruno Oliveira 66673c0dd3 Remove obsolete docstring 2016-08-17 22:59:18 -03:00
Bruno Oliveira 030c42203d Fix conflicts in CHANGELOG 2016-08-17 22:58:12 -03:00
Bruno Oliveira 3ba475c0f2 Move internal _is_unittest_unexpected_success_a_failure to "compat" module 
Fix #1815
 2016-08-17 22:50:10 -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 3e685d6a8d Merge pull request #1795 from hackebrot/fix-report-outcome-for-xpass 
WIP Change outcome to 'passed' for xfail unless it's strict
 2016-08-17 22:18:06 -03:00
Bruno Oliveira 68ebf552a1 Merge remote-tracking branch 'upstream/master' into fix-report-outcome-for-xpass 2016-08-17 21:55:10 -03:00
Bruno Oliveira a01cbce662 Merge pull request #1814 from nicoddemus/py35-trial-windows 
Enable py35-trial testenv on Windows
 2016-08-17 21:54:47 -03:00
Bruno Oliveira 0fb34cd2a1 Update CHANGELOG entries 2016-08-17 21:32:07 -03:00
Bruno Oliveira 224ef67374 Quick fix for tests in config depended on the current directory 
When running those tests from pytest's root folder, they would
fail because they would end up picking pytest's own pytest.ini
 2016-08-17 21:32:05 -03:00
Bruno Oliveira 4ed412eb59 unittest's unexpectedSuccess should work as non-strict xpass 
Make sure tests for that behavior obtain the same return code
using either pytest or unittest to run the same file
 2016-08-17 21:32:04 -03:00
Bruno Oliveira 92498109e4 Enable py35-trial testenv on Windows 2016-08-17 21:20:12 -03:00
Raphael Pierzina dfc659f781 Fix sys.version_info expression in xfail marker 2016-08-17 23:32:56 +01:00
Raphael Pierzina 0173952961 Fix py3 xfail expression evaluation and parametrize strict 2016-08-17 23:15:14 +01:00
Raphael Pierzina 767c28d422 Fix broken test in test_junitxml 2016-08-17 22:32:27 +01:00
Raphael Pierzina d1f2f779ee Use a better xfail reason 2016-08-17 22:31:56 +01:00
Raphael Pierzina bb3d6d87b6 Merge branch 'master' into fix-report-outcome-for-xpass 2016-08-17 22:15:29 +01:00
Raphael Pierzina 018197d72a Fix broken test in test_skipping and add one for strict xfail 2016-08-17 22:14:51 +01:00
Raphael Pierzina ea379e0e4f Fix test in test_junitxml and add one for strict 2016-08-17 22:02:54 +01: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
Florian Bruhin 09e647c7d9 Merge pull request #1812 from nicoddemus/deprecate-resultlog 
Deprecate --resultlog cmdline option
 2016-08-17 09:17:13 +02:00
Bruno Oliveira f25771a101 Deprecate --resultlog cmdline option 
Fix #830
 2016-08-16 21:40:34 -03:00
Raphael Pierzina 55ec1d7f56 Update test_junitxml.py to interpret XPASS as passed 2016-08-15 23:58:16 +01: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
Bruno Oliveira d58a8e36d7 Merge pull request #1807 from blueyed/improve-multiline-error-format 
Improve display of continuation lines with multiline errors
 2016-08-15 19:03:35 -03:00
Bruno Oliveira d3b855104c Merge pull request #1809 from blueyed/exitstatus-with-pytest_terminal_summary 
Pass exitstatus to pytest_terminal_summary hook
 2016-08-15 19:02:30 -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
Daniel Hahler 5b95ee3c19 Pass exitstatus to pytest_terminal_summary hook 
This is useful to know if a testrun has been interrupted
(EXIT_INTERRUPTED).
 2016-08-14 22:06:35 +02:00
Raphael Pierzina 225341cf2c Set wasxfail only for xpass w/o strict and else set longrepr 2016-08-13 00:00:51 +01:00
Raphael Pierzina 14a4dd0697 Extend test to verify longrepr in stdout 2016-08-12 23:31:38 +01:00
Raphael Pierzina 296f42a2c9 Treat unittest.expectedFailure pass as a failure 2016-08-12 23:18:36 +01:00
Raphael Pierzina 10a6ed1707 Update unittest test to expect failure for an unexpected success 2016-08-12 23:18:02 +01:00
Bruno Oliveira 34925a31a9 Merge pull request #1799 from cryporchild/junitxml-tests-tally-fix 
Fix #1798 to include errors in total tests in junit xml output.
 2016-08-08 10:43:38 -03:00
Christian Boelsen c4d9c7ea55 Add thanks as requested. 2016-08-08 13:45:10 +01:00