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

6946 Commits

Author SHA1 Message Date
Ronny Pfannschmidt def471b975 Merge pull request #2869 from nicoddemus/merge-master-into-features 
Merge master into features
 2017-10-25 09:08:08 +02:00
Ronny Pfannschmidt f743e95cfc Merge pull request #2791 from OfirOshir/features 
bugfix for issue #2491
 2017-10-25 09:04:01 +02:00
Bruno Oliveira 4e581b637f Use zip and map from six 2017-10-24 22:13:32 -02:00
Bruno Oliveira 6b86b0dbfe Fix additional linting issues 2017-10-24 21:01:00 -02:00
Bruno Oliveira 6821d36ca5 Merge remote-tracking branch 'upstream/master' into merge-master-into-features 2017-10-24 19:57:14 -02:00
Ronny Pfannschmidt 5631a86296 Merge pull request #2862 from tom-dalton-fanduel/issue-2836-fixture-collection-bug 
Issue 2836 fixture collection bug
 2017-10-24 16:32:50 +02:00
Tom Dalton f5e72d2f5f Unused import / lint 2017-10-24 11:25:42 +01:00
Tom Dalton a5ac19cc5e Merge branch 'issue-2836-fixture-collection-bug' of github.com:tom-dalton-fanduel/pytest into issue-2836-fixture-collection-bug 2017-10-24 10:45:06 +01:00
Tom Dalton 14e3a5fcb9 Move the generic separator to a constant 2017-10-24 10:42:16 +01:00
Florian Bruhin 7b608f976d Merge pull request #2865 from nicoddemus/contributing-docs 
Make CONTRIBUTING and PR template more consistent regarding doc contributions
 2017-10-24 06:46:32 +02:00
Bruno Oliveira fe560b7192 Make CONTRIBUTING and PR template more consistent regarding doc contributions 2017-10-23 18:46:14 -02:00
Bruno Oliveira b61cbc4fba Merge pull request #2859 from OwenTuz/issue-2692-document-setup-teardown-mismatch-in-unittest-integration 
2692.docs document setup/teardown behaviour when using unittest-based su…
 2017-10-23 18:35:25 -02:00
Bruno Oliveira a3ec3df0c8 Add E722 and E741 flake errors to the ignore list 
Also fixed 'E704 multiple statements on one line (def)' in python_api
 2017-10-23 18:19:15 -02:00
Florian Bruhin 531e0dcaa3 Merge pull request #2863 from lancelote/patch-1 
Remove typo @ in assignment
 2017-10-23 20:51:07 +02:00
Pavel Karateev dc5f33ba5c Remove typo @ in assignment 2017-10-23 21:39:13 +03:00
Tom Dalton 655ab0bf8b Address more review comments, fix massive bug I reintroduced in the node-splitting code :-/ 2017-10-23 17:49:49 +01:00
Tom Dalton a7199fa8ab Docstring typo 2017-10-23 16:59:56 +01:00
Tom Dalton d714c196a5 Shorter code, longer docstring 2017-10-23 16:55:35 +01:00
Tom Dalton ee7e1c94d2 Remove redundant if, tidy if-body 2017-10-23 16:12:07 +01:00
Tom Dalton de9d116a49 Added Tom Dalton to AUTHORS 2017-10-23 15:37:15 +01:00
Tom Dalton f003914d4b Add changelog entry for #2836 2017-10-23 15:37:02 +01:00
Tom Dalton 1e6dc6f8e5 Working (I think) fix for #2836 2017-10-23 13:26:42 +01:00
Tom Dalton c03612f729 Test now looks for real expected output 2017-10-23 12:40:32 +01:00
Tom Dalton 29fa9d5bff Add failing test 2017-10-23 12:28:54 +01:00
Owen Tuz 3cdbb1854f #2692: Document setup/teardown behaviour when using unittest-based suites 2017-10-21 23:12:49 +01:00
Ronny Pfannschmidt 083084fcbc Merge pull request #2842 from ceridwen/features 
Use funcsigs and inspect.signature to do function argument analysis
 2017-10-20 07:49:08 +02:00
Bruno Oliveira f7387e45ea Fix linting 2017-10-19 21:50:15 -02:00
Ceridwen 3da28067f3 Replace introspection in compat.getfuncargnames() with inspect/funcsigs.signature 2017-10-19 16:01:26 -07:00
Bruno Oliveira 5c71151967 Add more text to the 2.6 and 3.3 announcement 
The text was a bit short for this important announcement.
 2017-10-19 20:48:23 -02:00
Ronny Pfannschmidt 3f9f4be070 Merge pull request #2845 from jespino/fix/2832 
Adding Failed exception to manage maxfail behavior
 2017-10-19 09:12:11 +02:00
Bruno Oliveira 4cb60dac3d Merge pull request #2850 from bilderbuchi/docs-911 
Add documentation about python -m pytest invocation.
 2017-10-18 19:44:52 -02:00
Bruno Oliveira 8c7974af01 Merge pull request #2848 from bilderbuchi/fix-538 
Clarify the documentation of fixture scopes
 2017-10-18 19:18:57 -02:00
Bruno Oliveira e81b275eda Update formatting in CHANGELOG 2017-10-18 18:54:44 -02:00
Bruno Oliveira 537fc3c315 Merge pull request #2824 from dirk-thomas/pytest_addopts_before_initini 
get PYTEST_ADDOPTS before calling _initini
 2017-10-18 18:35:12 -02:00
Christoph Buchner 46cc9ab77c Add documentation about python -m pytest invocation. 2017-10-18 21:30:56 +02:00
Florian Bruhin 2d08005039 Merge pull request #2847 from meawoppl/patch-1 
Spelling Fix
 2017-10-18 07:50:43 +02:00
Christoph Buchner baadd569e8 Clarify the documentation of fixture scopes. Closes #538. 2017-10-17 23:42:32 +02:00
Matty G 11b391ff49 Update mark.py 2017-10-17 14:11:07 -07:00
Jesús Espino 00d3abe6dc Adding Failed exception to manage maxfail behavior 2017-10-17 21:32:20 +02:00
Ronny Pfannschmidt 71c76d96d3 Merge pull request #2834 from aysonje/ignore-setup 
ignore valid setup.py during --doctest-modules
 2017-10-17 07:19:09 +02:00
Bruno Oliveira 3676da594c Merge pull request #2841 from pgiraud/patch-1 
Fix auto-use fixture doc
 2017-10-16 21:18:18 -02:00
Bruno Oliveira 843872b501 Improve formatting in 502.feature file 2017-10-16 21:07:57 -02:00
Pierre GIRAUD a4fd5cdcb5 Fix auto-use fixture doc 2017-10-16 10:23:35 +02:00
Florian Bruhin ae4e596b31 Merge pull request #2840 from MarSoft/patch-2 
Fix typo in parametrization doc
 2017-10-16 05:23:12 +02:00
Семён Марьясин cfdebb3ba4 Fix typo in parametrization doc 2017-10-16 01:55:30 +03:00
je eaf38c7239 call path.read(), add tests, add news fragment 2017-10-14 00:49:54 +08:00
je b29a9711c4 ignore valid setup.py during --doctest-modules 2017-10-14 00:49:45 +08:00
Ronny Pfannschmidt c750a5beec Merge pull request #2794 from thisch/catchlog 
Merge pytest-catchlog plugin
 2017-10-12 09:02:46 +02:00
Ronny Pfannschmidt df37cdf51f Merge pull request #2808 from georgeyk/allow-module-level-skip 
Allow module level skip
 2017-10-12 06:50:53 +02:00
Thomas Hisch af75ca435b Fix some coding-style issues in the logging plugin 2017-10-12 02:19:24 +02:00