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

2030 Commits

Author SHA1 Message Date
Bruno Oliveira 3d89905114 Merge remote-tracking branch 'upstream/master' into features 2017-07-26 19:01:28 -03:00
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 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 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
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 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
Segev Finer 43544a431c Early import colorama so that it get's the correct terminal 2017-07-24 15:17:39 +03: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 1b732fe361 Merge pull request #2606 from kalekundert/simplify-numpy 
Make approx more compatible with numpy
 2017-07-22 14:21:08 -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 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
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
Bruno Oliveira 7341da1bc1 Introduce pytest.mark.filterwarnings 2017-07-20 22:31:49 -03:00
Bruno Oliveira abb5d20841 Merge branch 'master' into features 2017-07-20 22:10:58 -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 d44565f385 Merge remote-tracking branch 'upstream/master' into fix-flake8-errors 2017-07-19 17:57:30 -03:00
Bruno Oliveira 26ee2355d9 Merge remote-tracking branch 'upstream/features' into fix-flake8-errors 2017-07-19 17:09:05 -03:00
Bruno Oliveira c92760dca8 Merge branch 'fix-flake8-issues' 2017-07-19 17:03:36 -03:00
Florian Bruhin eb79fa7825 Merge pull request #2590 from nicoddemus/current-test-var 
Introduce new PYTEST_CURRENT_TEST environment variable
 2017-07-19 15:56:32 +02:00
Bruno Oliveira 2d4f1f022e Introduce PYTEST_CURRENT_TEST environment variable 
Fix #2583
 2017-07-19 10:01:50 -03:00
Ronny Pfannschmidt 62556bada6 remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage 
fixes #2573
 2017-07-19 08:44:52 +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 7b1870a94e Fix flake8 in features branch 2017-07-17 21:16:14 -03:00
Bruno Oliveira 4fd92ef9ba Merge branch 'fix-flake8-issues' into features 2017-07-17 21:05:39 -03: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 7d2ceb7872 Fixed E501 flake8 errors 
line too long (> 120 characters)
 2017-07-17 01:44:23 +02:00
Andras Tim 45ac863069 Fixed E401 flake8 errors 
multiple imports on one line
 2017-07-17 01:44:23 +02:00
Andras Tim 7248b759e8 Fixed E303 flake8 errors 
too many blank lines (3)
 2017-07-17 01:44:23 +02:00
Andras Tim b840622819 Fixed E302 flake8 errors 
expected 2 blank lines, found 0
 2017-07-17 01:44:23 +02:00
Andras Tim 17a21d540b Fixed E301 flake8 errors 
expected 1 blank line, found 0
 2017-07-17 01:44:23 +02:00
Andras Tim c9a081d1a3 Fixed E271 flake8 errors 
multiple spaces after keyword
 2017-07-17 01:44:22 +02:00
Andras Tim 195a816522 Fixed E265 flake8 errors 
block comment should start with ‘# ‘
 2017-07-17 01:44:22 +02:00
Andras Tim 8f3eb6dfc7 Fixed E261 flake8 errors 
at least two spaces before inline comment
 2017-07-17 01:44:22 +02:00
Andras Tim b226454582 Fixed E251 flake8 errors 
unexpected spaces around keyword / parameter equals
 2017-07-17 01:44:22 +02:00