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

6695 Commits

Author SHA1 Message Date
Lawrence Mitchell b39f957b88 Add test of issue #920 2017-07-26 14:38:38 +01: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
Bruno Oliveira 80f4699572 approx raises TypeError in Python 2 for comparison operators other than != and == 2017-07-25 20:07:10 -03:00
Maik Figura 57a232fc5a Remove out of scope change 2017-07-25 19:19:14 -03:00
Maik Figura 1851f36beb Add PR requirements changelog and authors 2017-07-25 19:19:14 -03:00
Maik Figura f0936d42fb Fix linter errors 2017-07-25 19:17:58 -03:00
Maik Figura d3ab1b9df4 Add user documentation 
The new doc section explains why we raise a `NotImplementedError`.
 2017-07-25 19:17:58 -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 73c6122f35 Merge remote-tracking branch 'upstream/master' into features 2017-07-24 21:12:51 -03: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
Florian Bruhin 309152d9fd Merge pull request #2599 from nicoddemus/turn-warnings-into-errors 
Turn warnings into errors WIP, waiting #2598
 2017-07-23 11:27:14 +02:00
Bruno Oliveira d5bb2004f9 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-23 00:50:28 -03:00
Bruno Oliveira bda07d8b27 Ignore socket warnings on windows for trial tests 2017-07-22 21:44:18 -03:00
Bruno Oliveira 0726d9a09f Turn warnings into errors in pytest's own test suite 
Fix #2588
 2017-07-22 21:44:18 -03:00
Bruno Oliveira 61219da0e2 Update PR guide and add a "short" version 2017-07-22 16:08:18 -03:00
Bruno Oliveira 1b732fe361 Merge pull request #2606 from kalekundert/simplify-numpy 
Make approx more compatible with numpy
 2017-07-22 14:21:08 -03:00
Bruno Oliveira b35554ca2b Merge pull request #2607 from kalekundert/remove-code-dup 
Remove stale copies of raises and approx
 2017-07-22 14:20:53 -03:00
Kale Kundert 7e0553267d
Remove unused import. 2017-07-22 09:19:13 -07:00
Kale Kundert ebc7346be4
Raise TypeError for types that can't be compared to arrays. 2017-07-22 09:05:12 -07:00
Kale Kundert a3b35e1c4b
Remove `raises` and `approx` from `python.py`. 
These two classes were recently moved to `python_api.py`, but it seems
that they found their way back into the original file somehow.  This
commit removes them again to avoid out-of-date code duplication.
 2017-07-22 08:36:15 -07:00
Kale Kundert 4c45bc9971
Add the numpy tests back into tox.ini 
I'm not sure why they were removed...
 2017-07-22 08:24:45 -07:00
Kale Kundert 495f731760
Simplify how comparisons with numpy arrays work. 
Previously I was subverting the natural order of operations by
subclassing from `ndarray`, but it turns out that you can tell just
numpy to call your operator instead of its by setting the
`__array_priority__` attribute on your class.  This is much simpler, and
it turns out the be a little more robust, too.
 2017-07-22 07:52:03 -07: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
Bruno Oliveira 6461dc9fc6 Merge pull request #2600 from RonnyPfannschmidt/mark_explicit_params 
fix #2540, introduce mark.with_args
 2017-07-21 10:42:25 -03: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
Ronny Pfannschmidt 65b2de13a3 fix #2540, introduce mark.with_args 2017-07-21 13:37:09 +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
Ronny Pfannschmidt cbceef2008 Merge pull request #2598 from nicoddemus/filterwarnings-mark 
Introduce filter-warnings mark
 2017-07-21 06:23:18 +02:00
Bruno Oliveira 7341da1bc1 Introduce pytest.mark.filterwarnings 2017-07-20 22:31:49 -03:00