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

6089 Commits

Author SHA1 Message Date
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 7f8e315285 Merge pull request #1615 from gnprice/deadcode 
Cut a dead test helper function
 2016-06-16 00:42:01 -03:00
Bruno Oliveira c5424643f0 Merge pull request #1614 from gnprice/loop 
Simplify default pytest_runtestloop
 2016-06-16 00:29:03 -03:00
Greg Price ab8b2e75a3 Simplify default pytest_runtestloop 
The inner function and the explanatory comment it makes necessary can
all be removed if we switch to an if/else rather than try/except for
this condition.

Perhaps this bit comes from my fondness for C, but I think I would
find this style clearer and easier to understand even if it weren't
for the Python 2 quirk that makes the other style require us to add an
unnecessary-looking function abstraction.  In any case, given that the
alternative does require that abstraction this is definitely simpler.
 2016-06-15 18:27:08 -07:00
Greg Price 2a3cbdf4d1 Cut a dead test helper function 
This appears to have been unused since commit
320835d "split out pytest-xdist related reporting to the plugin"
in July 2010.  It's the only caller outside of _pytest/runner.py
of the `call_and_report` helper function there, so cutting it out
makes that more of a pure helper function and makes it slightly
easier to understand the code in _pytest/runner.py .
 2016-06-15 18:26:10 -07: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
taschini 1218392413 Added taschini to AUTHORS and #1597 to CHANGELOG.rst. 2016-06-14 07:16:20 +02:00
taschini 4d9e293b4d Incorporated feedback (#1597). 
Fixed problem caused in a test on Windows by file left open by PyPy and not immediately garbage collected.
 2016-06-14 07:12:40 +02:00
taschini e2e6e31711 Ensure that a module within a namespace package can be found by --pyargs. 2016-06-14 07:12:40 +02:00
Raphael Pierzina adc50ac72f Change format for test function locations 2016-06-12 15:58:32 +01:00
Ronny Pfannschmidt 66e66f61e8 Merge pull request #1605 from guyzmo/issue/1604 
Fixed issue shadowing error when missing argument on teardown_method
 2016-06-12 12:05:37 +02:00
Guyzmo accd962c9f Fixed issue shadowing error when missing argument on teardown_method 
When the method argument is missing on teardown_method, the traceback is
100% internal to pytest, which with default options get pruned. Then
that traceback is empty, leading to a new exception as a traceback shall
not be empty.

This PR fixes that issue by pushing back the last stack on the
traceback, when the stacktrace is empty after pruning. Then the output
is still pruned, but gives meaningful information with the item where it
failed on the stack.

* fixes issue #1604

Signed-off-by: Guyzmo <guyzmo+github@m0g.net>
 2016-06-12 03:45:24 +02: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
Ronny Pfannschmidt 577cce2554 Merge pull request #1593 from marscher/fix_cwd_explosion 
Fix cwd explosion
 2016-06-10 07:24:18 +02: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
marscher 09d163aa3a [exception handling] Fix case the current working directory (CWD) gets deleted during testing. 
Fixes #1235.
 2016-06-08 15:18:23 +02:00
Ronny Pfannschmidt 70fdab4cfa Merge pull request #1584 from mgedmin/patch-1 
Docs: config.option is deprecated
 2016-06-02 09:27:32 +02:00
Marius Gedminas 3ad5b9de86 Docs: config.option is deprecated 
https://pytest.org/latest/writing_plugins.html#_pytest.config.Config says config.option is deprecated and one should use config.getoption() instead.
 2016-06-02 09:52:56 +03:00
Ronny Pfannschmidt 9b6dc93496 Merge pull request #1583 from nicoddemus/fix-tox-doctesting 
Use same python which invoked tox for "doctesting" env
 2016-06-02 08:10:33 +02:00
Bruno Oliveira 2c4b76b754 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-01 20:30:26 -03:00
Bruno Oliveira 63ced4d486 List contributors alphabetically in AUTHORS 2016-06-01 20:21:51 -03:00
Bruno Oliveira 97c89e6dc3 Merge branch 'fix-all-skipped-but-none-exist' 2016-06-01 20:20:50 -03:00
Bruno Oliveira dd9c81ca26 Mention #1580 in the CHANGELOG and add Thomas Grainger to AUTHORS 2016-06-01 19:56:45 -03:00
Thomas Grainger 74862b8f2f
Don't mark empty doctest files as skipped, fixes #1578 2016-06-01 19:19:14 +01:00
Florian Bruhin 057007fb52 Merge pull request #1582 from graingert/patch-1 
Fix rst-lint CHANGELOG error
 2016-06-01 19:25:18 +02:00
Thomas Grainger 2898dffb9e
Fix rst-lint CHANGELOG error 2016-06-01 17:43:41 +01:00
Ronny Pfannschmidt 7305adfdba fix another copy&paste error in the announcement list 2016-06-01 08:55:44 +02:00
Ronny Pfannschmidt fad6266a47 finish up the version bump in __init__ i forgot 2016-06-01 08:18:10 +02: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