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

4176 Commits

Author SHA1 Message Date
holger krekel e9d4853296 Merged contributing-community into default 2015-02-27 11:17:14 +01:00
holger krekel 28c2327f73 move conftest visibility tests and their setup into a class, accomodates @nicoddemus 's comment 
--HG--
branch : issue616
 2015-02-27 09:51:53 +01:00
holger krekel 8ed5b77aba fix issue650: introduce new --doctest-ignore-import-errors option courtesy 
of Charles Cloud.
 2015-02-26 22:02:49 +01:00
holger krekel 660b84a052 Merged in cpcloud/pytest/ignore-doctest-import-errors (pull request #243) 
Add option to ignore import errors in doctests
 2015-02-26 21:59:54 +01:00
holger krekel d73e689991 fix issue616 - conftest visibility fixes. This is achieved by 
refactoring how nodeid's are constructed.  They now are always
relative to the "common rootdir" of a test run which is determined by
finding a common ancestor of all testrun arguments.

--HG--
branch : issue616
 2015-02-26 21:56:44 +01:00
Phillip Cloud c773ea664b Add test for command line usage 
--HG--
branch : ignore-doctest-import-errors
 2015-02-26 12:39:36 -05:00
holger krekel aa757f7715 change "install" targets to use pytest-dev user so that Brianna, Ronny, me 
and others can push to pytest.org
 2015-02-23 16:14:54 +01:00
Ronny Pfannschmidt 4222a806f1 Merged in LucasC/pytest (pull request #247) 
Fixing description of --dist=load in the --help documentation for the xdist plugin
 2015-02-22 20:04:05 +01:00
Ronny Pfannschmidt 415c76b255 Merged in tush/pytest/junit-verbose-failures (pull request #240) 
Made failure message in junit xml report more informative
 2015-02-22 19:13:07 +01:00
Ronny Pfannschmidt f1c9554f42 merge 2015-02-22 12:29:26 +01:00
Ronny Pfannschmidt 3d0b756877 merge in the 2.6 maintenance branch 2015-02-22 11:45:07 +01:00
holger krekel ea4e9fa4e2 Merged in msabramo/pytest/remove_pdbpp_xfail (pull request #250) 
Remove pdbpp xfails; don't seem necessary anymore
 2015-02-19 12:42:23 +01:00
Marc Abramowitz 777bde7c60 Remove xfail_if_pdbpp_installed from test_pdb.py 
--HG--
branch : remove_pdbpp_xfail
 2015-02-19 03:22:05 -08:00
Marc Abramowitz e19f3c260f Remove pdbpp xfails; don't seem necessary anymore 
It seems that they're no longer necessary as the tests pass now

    [marca@marca-mac2 pytest]$ pip freeze
    backports.inspect==0.0.2
    fancycompleter==0.4
    funcsigs==0.2
    ordereddict==1.1
    -e hg+ssh://hg@bitbucket.org/antocuni/pdb@4bda65ac8f8cc9b1850e0301669aac39200f2f9a#egg=pdbpp-fix_pytest_doctest_NoneType_object_has_no_attribute_lower
    py==1.4.26
    Pygments==1.6
    pyrepl==0.8.4
    -e hg+ssh://hg@bitbucket.org/hpk42/pytest@5fc366c50b56a94638c959be8456d2cb3c7e7c1c#egg=pytest-dev
    wmctrl==0.1
    [marca@marca-mac2 pytest]$ py.test testing/test_doctest.py --tb=short
    ============================================================================= test session starts ==============================================================================
    platform darwin -- Python 2.7.9 -- py-1.4.26 -- pytest-2.7.0.dev1
    collected 22 items

    testing/test_doctest.py ......................

    ========================================================================== 22 passed in 1.61 seconds ===========================================================================

See https://bitbucket.org/antocuni/pdb/issue/24/doctests-fail-when-pdbpp-is-installed

--HG--
branch : remove_pdbpp_xfail
 2015-02-19 03:03:56 -08:00
Lucas Cimon 5025478ac2 Fixing description of --dist=load in the --help documentation for the xdist plugin 2015-02-14 00:07:19 +01:00
Floris Bruynooghe 5b73de92c2 Merged in jeffwidman/pytest/jeffwidman/fix-faq-grammar-and-spelling-1423641159173 (pull request #246) 
Fix FAQ grammar and spelling
 2015-02-12 09:32:32 +00:00
Jeff Widman 6a237bd49f Changed back to "parametrized" to match the API 
--HG--
branch : jeffwidman/fix-faq-grammar-and-spelling-1423641159173
 2015-02-11 19:27:51 +00:00
Jeff Widman 89710b4901 Fix: FAQ grammar and spelling 
--HG--
branch : jeffwidman/fix-faq-grammar-and-spelling-1423641159173
 2015-02-11 07:52:48 +00:00
Floris Bruynooghe 459d6e610c Merged in davehunt/pytest/env-addopts (pull request #241) 
Support setting configuration using the PYTEST_ADDOPTS environment variable
 2015-02-09 16:33:36 +00:00
Dave Hunt d1adbf4a5c Added documentation for PYTEST_ADDOPTS environment variable, updated CHANGELOG and AUTHORS. 
--HG--
branch : env-addopts
 2015-02-09 14:11:54 +00:00
holger krekel c11cc36997 Merged in pfctdayelise/pytest_new/adopt-pytest-docs (pull request #244) 
#676 Add docs page describing 'adopt pytest month'
 2015-02-09 12:40:41 +01:00
Brianna Laugher 2b7fae2368 #676 
Add  docs page describing 'adopt pytest month'

--HG--
branch : adopt-pytest-docs
 2015-02-09 11:59:15 +01:00
Phillip Cloud f2ca0b8170 Add option to ignore import errors in doctests 
--HG--
branch : ignore-doctest-import-errors
 2015-02-08 01:25:23 -05:00
Dave Hunt 912c8f0540 Use monkeypatch to set the PYTEST_ADDOPTS environment variable in the test. 
--HG--
branch : env-addopts
 2015-01-29 10:52:01 +00:00
Dave Hunt 8f12269db7 Use shlex to split the arguments from PYTEST_ADDOPTS. 
--HG--
branch : env-addopts
 2015-01-26 10:39:21 +00:00
Dave Hunt 7325a5fe2e Support setting configuration using the PYTEST_ADDOPTS environment variable. 
--HG--
branch : env-addopts
 2015-01-23 20:09:42 +00:00
tush home 9f4d0be895 Failure message in junit xml report now are more informative 
--HG--
branch : junit-verbose-failures
 2015-01-20 01:45:26 +03:00
holger krekel 394367e1d2 Merged in nicoddemus/pytest/pastebin-xdist (pull request #239) 
Using pytest-xdist and --paste=all results in error
 2015-01-19 22:34:43 +01:00
Bruno Oliveira 7e15fb7f2d Attempting to patch terminal only if terminalreporter is available 
This fixes the flag "--paste=all" when running tests with xdist, as slaves would
attempt to patch a non-existing terminal during pytest_configure. Only the master
node has a terminalreporter installed.

--HG--
branch : pastebin-xdist
 2015-01-19 19:20:01 -02:00
holger krekel 8859936301 Merged in okin/pytest/okin/only-one-import-on-one-line-if-this-shou-1421239108222 (pull request #238) 
Only one import on one line.
 2015-01-15 21:22:49 +01:00
okin d580f5bac8 Only one import on one line. 
If this should show good practices, the code should not set a bad example ;)

--HG--
branch : okin/only-one-import-on-one-line-if-this-shou-1421239108222
 2015-01-14 12:38:37 +00:00
Ronny Pfannschmidt 5941b2e071 fix issue 655: crude workarounds around python2/3 exception leaks 2015-01-09 19:55:49 +01:00
James Tatum bca19a1156 Cleaning up the docstrings in monkeypatch.py 2015-01-08 17:15:22 -08:00
Floris Bruynooghe 3df5989326 Revert pypi badge again as the svg broke 
This reverts the pypi badge back to the pypip.in provided one
because the shields.io one failed to render properly (and also
wasn't on https).
 2014-11-24 08:48:09 +00:00
Floris Bruynooghe 98b9de4ff1 Merged in techtonik/pytest/techtonik/readmerst-fix-link-to-pypi-1416719991514 (pull request #234) 
README.rst fix link to PyPI
 2014-11-24 08:41:53 +00:00
anatoly techtonik 0e248c9aed README.rst fix link to PyPI 
--HG--
branch : techtonik/readmerst-fix-link-to-pypi-1416719991514
 2014-11-23 05:20:01 +00:00
holger krekel 883b3ca2c1 add a py.test placeholder setup that errors out when trying to get installed 
(this is registered at pypi.python.org already)
 2014-10-30 11:38:13 +01:00
Floris Bruynooghe e4bb48995a Mention fix for issue 615 in changelog 
Fixes issue 615.
 2014-10-28 13:31:09 +00:00
Floris Bruynooghe 1d15bb2880 Merged in tomviner/pytest/format_boolop_percent6 (pull request #231) 
fix for issue #615: _format_boolop must escape %
 2014-10-28 13:26:21 +00:00
holger krekel 959395b796 fix py26 compatibility 2014-10-27 10:02:15 +01:00
TomV f6caf230f8 fix for issue615: _format_boolop must escape % 
fix test for issue615: expression must eval False

--HG--
branch : format_boolop_percent6
 2014-10-27 08:57:58 +00:00
holger krekel f2cdbe776e bump version to 2.7 on default 2014-10-26 10:52:04 +01:00
holger krekel 97c9c10f3c remove "universal wheel" again until the py26/py27 difference (argparse) does not play a role anymore. 2014-10-25 07:21:21 +02:00
holger krekel f74930db79 Merged in alex_gaynor/pytest-1/alex_gaynor/mark-pytest-as-a-universal-wheel-1414169551518 (pull request #230) 
Mark pytest as a universal wheel
 2014-10-24 20:04:13 +02:00
Alex Gaynor 5a88a9b22a Mark pytest as a universal wheel 
--HG--
branch : alex_gaynor/mark-pytest-as-a-universal-wheel-1414169551518
 2014-10-24 16:52:43 +00:00
holger krekel d0d4759c96 fix changelog -- we should have all changes in trunk that are in 2.6.4 2014-10-24 17:19:54 +02:00
holger krekel 749316623b Added tag 2.6.4 for changeset f03b6de8325f 
--HG--
branch : pytest-2.6
 2014-10-24 17:12:24 +02:00
holger krekel 60cdb875ed backport pastebin fix 
--HG--
branch : pytest-2.6
 2014-10-24 15:24:44 +02:00
holger krekel e0251ecb41 regen docs 
--HG--
branch : pytest-2.6
 2014-10-24 15:08:43 +02:00
holger krekel 0834b63560 backport fixed issue620 (doc for genscript) 
--HG--
branch : pytest-2.6
 2014-10-24 13:53:39 +02:00