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

5992 Commits

Author SHA1 Message Date
Ronny Pfannschmidt 400b0779f9 Merge pull request #2213 from RonnyPfannschmidt/release-3.0.6 
Release 3.0.6
 2017-01-22 22:21:53 +01:00
Ronny Pfannschmidt c9f327dc87 bump version to next dev 2017-01-22 22:21:08 +01:00
Ronny Pfannschmidt 0e64cd045c take off author_email after pypi rejects 2017-01-22 22:14:54 +01:00
Ronny Pfannschmidt 22da561ae5 fix copy+paste error, its supposed to be 3.0.6 2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt 449b88c640 rerun regendoc with correct install 2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt 34b898b47e generate the release announcement 2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt 01eaf9db51 fix the xfail docstring typo at the actual docstring + regendoc 2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt 4d0c635252 regendoc 2017-01-22 18:44:30 +01:00
Ronny Pfannschmidt 55f21bd2b9 bump version 2017-01-22 18:44:30 +01:00
Bruno Oliveira c39d846c1b Merge pull request #2215 from RonnyPfannschmidt/fix-doctesting/devpi-bug 
fix devpi test for doctesting env
 2017-01-22 13:02:03 -02:00
Ronny Pfannschmidt 403122281a fix devpi test for doctesting env 
due to a devpi bug, we always get a sdist install which in turn triggers
the pytest issue #2042 / #726

going for pyargs and a changed folder, it should no longer happen
(and will be tested firther after rebasing the release branch)
 2017-01-22 11:48:05 +01:00
Bruno Oliveira 15a3b57ec7 Merge pull request #2120 from RonnyPfannschmidt/fix-2118 
fix #2118 - rework Node._getcustomclass and Node compat properties
 2017-01-20 14:38:55 -02:00
Ronny Pfannschmidt 6a96b464ab update changelog as suggested 2017-01-20 15:26:59 +01:00
Ronny Pfannschmidt 7b4afd8946 remove unused import 2017-01-20 12:09:49 +01:00
Ronny Pfannschmidt 1a2d6388ac Merge pull request #2211 from nicoddemus/trial-envs 
Fix pytester internal plugin to work correctly with latest versions of zope.interface
 2017-01-20 12:08:12 +01:00
Bruno Oliveira 3766060893 Merge branch 'master' into trial-envs 2017-01-20 08:37:34 -02:00
Ronny Pfannschmidt 4082f4024a comment out compatproperty deprecations 
todo: reenable in the features branch
 2017-01-20 11:25:48 +01:00
Ronny Pfannschmidt e0c48b4fe7 Merge pull request #2212 from nicoddemus/pytester-rewrite 
Assert statements of the pytester plugin again benefit from assertion rewriting

fixes #1920
 2017-01-20 10:04:12 +01:00
Bruno Oliveira 7b4368f3f4 Merge pull request #2184 from eli-b/parseoutcomes-explicit-failure 
Fail assert_outcomes() on missing terminal report
 2017-01-19 21:38:54 -02:00
Bruno Oliveira c477f09177 Assert statements of the pytester plugin again benefit from assertion rewriting 
Fix #1920
 2017-01-19 21:33:51 -02:00
Bruno Oliveira 2574da8d32 Fix pytester internal plugin to work correctly with latest versions of zope.interface 
Fix #1989
 2017-01-19 20:53:35 -02:00
Ronny Pfannschmidt d15724f74f Merge pull request #2204 from nicoddemus/linux-marker-doc 
Fix marker example on "linux" platform
 2017-01-18 09:34:34 +01:00
Bruno Oliveira 61fa91f3d0 Fix marker example on "linux" platform 
I cheated a little and updated the example output by hand. 😁

Fix #2200
 2017-01-17 21:09:04 -02:00
Ronny Pfannschmidt 125e89b7f8 Merge pull request #2194 from rjprins/remove-reinterp-from-docs 
Remove mention of --assert=reinterp in documentation
 2017-01-14 14:58:50 +01:00
Rutger Prins 46a9861d29 Remove mention of --assert=reinterp in documentation 
Related to #1940
 2017-01-13 22:35:37 +01:00
Bruno Oliveira 3dfdbaf490 Merge pull request #2186 from nicoddemus/pytest-plugins-env-rewrite 
Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite
 2017-01-12 23:29:58 -02:00
Bruno Oliveira 7cd7c283dd Refactor plugin specs handling into an isolated function 2017-01-12 14:31:35 -02:00
Bruno Oliveira 043aadeaf2 Consider plugins loaded by PYTEST_PLUGINS for assertion rewrite 
Fix #2185
 2017-01-11 17:15:16 -02:00
Eli Boyarski e18b2a427a Fail assert_outcomes() on missing terminal report 
Currently if the terminal report of testdir.runpytest() is missing,
assert_outcomes() on its output fails because parseoutcomes()
returns an unexpected value (None).
It's better to fail parseoutcomes() directly.
 2017-01-11 17:09:37 +02:00
Ronny Pfannschmidt ff309b3584 Merge pull request #2182 from pombredanne/patch-1 
Ensure the LICENSE is included in built wheels
 2017-01-10 21:44:43 +01:00
Philippe Ombredanne aa82db9fe2 Ensure the LICENSE is included in built wheels 
Otherwise it is not included by default as wheels do not honor the MANIFEST.in

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
 2017-01-10 19:25:57 +01:00
Bruno Oliveira 64cb67b703 Merge pull request #2174 from nicoddemus/appveyor-py36 
Test py36 on AppVeyor
 2017-01-05 22:35:20 -02:00
Bruno Oliveira 7559400183 Add py36 to test on AppVeyor 
Fix #2134
 2017-01-05 19:18:03 -02:00
Bruno Oliveira 9477f598d8 Merge pull request #2173 from jeffwidman/patch-1 
Switch monkeypatch fixture to yield syntax
 2017-01-04 23:17:30 -02:00
Jeff Widman 6d81c684cc Switch monkeypatch fixture to yield syntax 2017-01-04 15:06:52 -08:00
Bruno Oliveira b769e41d8f Merge pull request #2170 from gogoengie/broken-links 
Fix broken links
 2017-01-02 21:57:17 -02:00
Peter Heatwole ef903460b1 Fix broken links 2017-01-02 14:19:49 -08:00
Bruno Oliveira 78f03888f4 Merge pull request #2168 from jwilk/spelling 
Fix typos
 2017-01-01 20:08:08 -02:00
Jakub Wilk 03a7a2cd3e Fix typos 2016-12-31 19:01:15 +01:00
Bruno Oliveira 7592c5b491 Sort issues and user references in CHANGELOG 2016-12-27 23:20:34 -02:00
Bruno Oliveira 091148f843 Merge pull request #2136 from hroncok/i2132 
Tests: Check for ModuleNotFoundError on Python 3.6+
 2016-12-27 23:10:58 -02:00
Bruno Oliveira 718f0b0255 Merge pull request #2130 from malinoff/fix-2129 
Use inspect to properly detect generators. Fixes #2129
 2016-12-27 22:11:46 -02:00
Bruno Oliveira b4295aa19e Merge pull request #2144 from sscherfke/patch-1 
Explicitly add setuptools to install_requires
 2016-12-27 22:08:39 -02:00
Bruno Oliveira 7d259401cd Merge pull request #2161 from nicoddemus/silence-trial-on-ci 
Allow trial environments to fail on CI for now
 2016-12-27 22:04:50 -02:00
Bruno Oliveira 515fb09995 Move module error compatibility code to _pytest.compat 2016-12-27 22:01:22 -02:00
Bruno Oliveira 088b742d40 Merge pull request #2149 from pelme/issue2148 
Fix handling of ini configuration in subdirs when specifying ::
 2016-12-27 21:54:14 -02:00
Miro Hrončok 6b24ce2a9d Test Python 3.6 on Travis CI 
Partial fix for https://github.com/pytest-dev/pytest/issues/2134
 2016-12-27 23:16:25 +01:00
Miro Hrončok 1680eeb3a3 Tests: Check for ModuleNotFoundError on Python 3.6+ 
Those tests originally checked for ImportError. Since Python 3.6
ModuleNotFoundError is raised in this context instead, the tests didn't work
as they are text based (so exception inheritance does not save the day).

Fixes https://github.com/pytest-dev/pytest/issues/2132
 2016-12-27 23:15:12 +01:00
Andreas Pelme 0bb8a4a36d Fixed #2148 - parse directory names properly when args contains ::. 
This commit also improves readbility in get_dirs_from_args by using self
documenting local functions.

get_dirs_from_args also now only returns directories that actually exists,
and not files to avoid confusion.

This commit also removes redundant checks in get_common_ancestor that
was already performed in get_dirs_from_args..
 2016-12-27 15:28:56 +01:00
Bruno Oliveira f7a1d369c3 Allow trial environments to fail on CI for now 
While I agree this is *far* from ideal, IMHO It is better to ignore them for now otherwise we hamper contributors with unrelated errors.

We should fix this before the next release.

#1989
 2016-12-26 21:47:50 -02:00