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

6608 Commits

Author SHA1 Message Date
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 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
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
Ronny Pfannschmidt 65b2de13a3 fix #2540, introduce mark.with_args 2017-07-21 13:37:09 +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
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 9e3e58af60 Merge pull request #2594 from nicoddemus/fix-flake8-errors 
Merge master into features and fix flake8 errors
 2017-07-20 23:20:55 +02: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 24da938321 Fix additional flake8 errors 2017-07-19 17:42:21 -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
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
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 d7f182ac4f Remove SETUPTOOLS_SCM_PRETEND_VERSION during linting 
It was needed because of check-manifest, but we no longer have a
MANIFEST file so it is not necessary
 2017-07-19 10:02:13 -03:00
Bruno Oliveira 2d4f1f022e Introduce PYTEST_CURRENT_TEST environment variable 
Fix #2583
 2017-07-19 10:01:50 -03:00
Bruno Oliveira 2c03000b96 Merge pull request #2585 from RonnyPfannschmidt/fix-2573 
remove the MARK_INFO_ATTRIBUTE warning until we can fix internal usage
 2017-07-19 07:46:38 -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 637e566d05 Separate all options for running/selecting tests into sections 2017-07-18 22:50:32 -03:00
Bruno Oliveira 3a1c9c0e45 Clarify in the docs how PYTEST_ADDOPTS and addopts ini option work together 2017-07-18 15:37:01 -03: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 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
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
Andras Tim b9e318866e Fixed E402 flake8 errors 
module level import not at top of file
 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