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

6558 Commits

Author SHA1 Message Date
Bruno Oliveira dd294aafb3 Merge pull request #2557 from blueyed/EncodedFile-name 
capture: ensure name of EncodedFile being a string
 2017-07-26 10:39:10 -03:00
Bruno Oliveira 2c2cf81d0a Merge pull request #2580 from andras-tim/fix-runpytest-subprocess 
Avoid interactive pdb when pytest tests itself - fix #2023
 2017-07-26 10:37:48 -03:00
Daniel Hahler 0603d1d500 capture: ensure name of EncodedFile being a string 
Fixes https://github.com/pytest-dev/pytest/issues/2555.
 2017-07-25 20:37:37 +02:00
Bruno Oliveira 79097e84e2 Merge pull request #2615 from blueyed/revisit_contributing.rst 
Revisit CONTRIBUTING.rst
 2017-07-25 13:40:45 -03:00
Bruno Oliveira 1a42e26586 Improve changelog wording to be more user-oriented 2017-07-25 13:37:06 -03:00
Bruno Oliveira 595ecd23fd Merge pull request #2548 from blueyed/skip-fix-lineno 
Fix lineno offset in show_skipped
 2017-07-25 13:35:14 -03:00
Daniel Hahler 949a1406f0 Revisit CONTRIBUTING.rst 2017-07-25 18:27:26 +02:00
Bruno Oliveira 71947cb4f0 Merge pull request #2546 from blueyed/better-skip-not-allowed-error 
[RFC] Improve error message for CollectError with skip/skipif
 2017-07-25 11:19:25 -03:00
Daniel Hahler 869eed9898 Fix lineno offset in show_skipped 
The line number is 0-based here, so add 1.
 2017-07-25 15:19:47 +02:00
Daniel Hahler 72531f30c0 Improve error message for CollectError with skip/skipif 2017-07-25 15:14:28 +02:00
Bruno Oliveira 70d9f8638f Merge pull request #2610 from AgriConnect/doctest-lineno 
Report lineno from doctest
 2017-07-24 16:29:02 -03:00
Nguyễn Hồng Quân d40d77432c Add test case for DoctestItem.reportinfo() 2017-07-24 23:07:45 +07:00
Bruno Oliveira e44284c125 Merge pull request #2611 from segevfiner/patch-1 
Early import colorama so that it get's the correct terminal
 2017-07-24 12:37:22 -03:00
Nguyễn Hồng Quân dea671f8ba Add changelog for #2610 2017-07-24 22:01:03 +07:00
Nguyễn Hồng Quân cdaa720bc4 Merge remote-tracking branch 'upstream/master' into doctest-lineno 2017-07-24 21:49:35 +07:00
Segev Finer d0ecfdf00f Delete trailing whitespace 2017-07-24 16:55:50 +03:00
Florian Bruhin 81ad185f0d Merge pull request #2595 from nicoddemus/docs-rootdir-pythonpath 
Clarify PYTHONPATH changes and ``rootdir`` roles
 2017-07-24 15:06:38 +02:00
Bruno Oliveira d90bef44cc Update changelog file for #2510 2017-07-24 09:31:16 -03:00
Segev Finer df12500661 Create 2611.bugfix 2017-07-24 15:28:20 +03:00
Segev Finer 43544a431c Early import colorama so that it get's the correct terminal 2017-07-24 15:17:39 +03:00
Bruno Oliveira 0aa2480e6a Fix travis build after change from "precise" to "trusty" 
Travis recently has changed its dist from "precise" to "trusty", so
some Python versions are no longer installed by default
 2017-07-24 07:44:04 -03:00
Florian Bruhin 6473a81b8b Merge pull request #2608 from nicoddemus/contributing-update 
Update PR guide and add a "short" version
 2017-07-24 12:14:56 +02:00
Nguyễn Hồng Quân af2c153324 Report lineno from doctest 
This is to fix pytest-sugar#122 issue.
 2017-07-24 11:52:24 +07:00
Bruno Oliveira 61219da0e2 Update PR guide and add a "short" version 2017-07-22 16:08:18 -03:00
Andras Tim 50764d9ebb Avoid interactive pdb when pytest tests itself - fix #2023 
The debugging.py calls post_mortem() on error and pdb will drops an
interactive debugger when the stdin is a readable fd.
 2017-07-21 21:29:03 +02:00
Florian Bruhin 1cf826624e Merge pull request #2602 from blueyed/doc-fix-filterwarnings 
Fix help for filterwarnings ini option
 2017-07-21 15:23:22 +02:00
Daniel Hahler 97e5a3c889 Fix help for filterwarnings ini option 2017-07-21 14:21:31 +02:00
Bruno Oliveira 3d24485cae Clarify PYTHONPATH changes and ``rootdir`` roles 
- Also minor adjustments in the docs (wording, formatting, links, etc).

Fix #2589
 2017-07-21 07:28:11 -03:00
Ronny Pfannschmidt ccc4b3a501 Merge pull request #2596 from nicoddemus/autopep-tox 
Add "fix-lint" tox environment
 2017-07-21 06:25:59 +02:00
Bruno Oliveira 3c28a8ec1a Improve formatting/grammar of changelog entries 2017-07-20 22:12:15 -03:00
Bruno Oliveira 22f54784c2 Add "fix-lint" tox environment to fix linting errors 2017-07-20 22:12:15 -03:00
Bruno Oliveira da12c52347 Fix: do not load hypothesis during test_logging_initialized_in_test 
A recent release seem to have added a "logging" import to the top-level,
which breaks test_logging_initialized_in_test
 2017-07-20 21:43:24 -03:00
Floris Bruynooghe 56e6b4b501 Merge pull request #2578 from Llandy3d/2375 
Provides encoding attribute on CaptureIO
 2017-07-20 23:14:14 +02:00
Bruno Oliveira c92760dca8 Merge branch 'fix-flake8-issues' 2017-07-19 17:03:36 -03:00
Bruno Oliveira 61d4345ea4 Merge pull request #2593 from hackebrot/extend-pytester-docs-for-testing-plugin-code 
Extend pytester docs for testing plugin code
 2017-07-19 16:40:00 -03:00
Raphael Pierzina 1ac02b8a3b Add plugin code 2017-07-19 20:15:27 +02:00
Raphael Pierzina d06d97a7ac Remove unnecessary comma from docs 2017-07-19 19:42:33 +02:00
Raphael Pierzina e73a2f7ad9 Add changelog entry changelog/971.doc 2017-07-19 19:38:21 +02:00
Raphael Pierzina 91b4b229aa Update documentation for testing plugin code 2017-07-19 19:38:21 +02:00
Raphael Pierzina 2840634c2c Fix typo and improve comment about cookiecutter-template 2017-07-19 19:38:21 +02:00
Ronny Pfannschmidt 0e559c978f Merge pull request #2587 from nicoddemus/remove-impl-file 
Remove _pytest/impl file
 2017-07-18 16:44:18 +02:00
Bruno Oliveira bd96b0aabc Remove _pytest/impl file 
The file apparently contains an early design document to what
has become @pytest.fixture and can be deleted
 2017-07-18 09:47:06 -03:00
Bruno Oliveira ac3f2207bb Merge pull request #2575 from MartinAltmayer/master 
#2574 Options --fixtures and --fixtures-per-test keep indentation of docstrings
 2017-07-17 18:06:56 -03:00
Andras Tim b2a5ec3b94 updated meta 2017-07-17 02:16:51 +02:00
Andras Tim b49e8baab3 Fixed E731 flake8 errors 
do not assign a lambda expression, use a def
 2017-07-17 01:44:23 +02:00
Andras Tim 15610289ac Fixed E712 flake8 errors 
comparison to True should be ‘if cond is True:’ or ‘if cond:’
 2017-07-17 01:44:23 +02:00
Andras Tim 5ae59279f4 Fixed E704 flake8 errors 
multiple statements on one line (def)
 2017-07-17 01:44:23 +02:00
Andras Tim bf259d3c93 Fixed E702 flake8 errors 
multiple statements on one line (semicolon)
 2017-07-17 01:44:23 +02:00
Andras Tim 85141a419f Fixed E701 flake8 errors 
multiple statements on one line (colon)
 2017-07-17 01:44:23 +02:00
Andras Tim 7d2ceb7872 Fixed E501 flake8 errors 
line too long (> 120 characters)
 2017-07-17 01:44:23 +02:00