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

3897 Commits

Author SHA1 Message Date
Daniel Hahler c629f6b18b Fix `reload()` with modules handled via `python_files` 
If a module exists in `sys.modules` already, `load_module` has to return it.

Fixes https://bitbucket.org/pytest-dev/pytest/issue/435

--HG--
branch : fix-reload
 2015-03-04 16:21:27 +01:00
Ronny Pfannschmidt 41e6b04f0b Merged in eks/pytest/issue616 (pull request #258) 
Add comments
 2015-03-02 14:38:10 +01:00
Eric Siegerman 97d5da5c99 Add comments 
--HG--
branch : issue616
 2015-03-01 17:32:00 -05:00
Anatoly Bubenkov bae0f7f46a Merged in plugincompat-move (pull request #256) 
moved pytest-plugs to plugincompat
 2015-02-28 21:32:57 +01:00
Anatoly Bubenkov 09a50b6e6d Close branch plugincompat-move 
--HG--
branch : plugincompat-move
 2015-02-28 21:32:57 +01:00
Bruno Oliveira 200fe072f1 moved pytest-plugs to plugincompat 
also plugins_index is ready for 2.7.0 release

--HG--
branch : plugincompat-move
 2015-02-28 17:22:42 -03:00
holger krekel ff9ec13ddb mention "pytestdotorg" twitter account 2015-02-28 20:02:31 +01:00
Ronny Pfannschmidt 9384ff38c9 Close branch issue616 
--HG--
branch : issue616
 2015-02-28 10:02:58 +01:00
Ronny Pfannschmidt 1e6e373913 Merged in issue616 (pull request #252) 
fix issue616 - conftest visibility fixes.
 2015-02-28 10:02:58 +01:00
holger krekel e510eb0d45 a few more fixes 2015-02-27 16:42:03 +01:00
holger krekel 2e2d6a8bef make "Adopt pytest" note more prominent, fix link from plugins page. 2015-02-27 15:49:25 +01:00
Benjamin Peterson 44cd1c9862 merge dead branch 2015-02-27 09:34:33 -05:00
Benjamin Peterson f6f084fa01 close branch 
--HG--
branch : update-issues
 2015-02-27 09:34:16 -05:00
holger krekel b7d212c0c9 Merged in update-issues (pull request #255) 
another update for get_issues.py to account for repository move
 2015-02-27 15:32:13 +01:00
Benjamin Peterson bda3e53df6 another update for get_issues.py to account for repository move 
--HG--
branch : update-issues
 2015-02-27 09:12:00 -05:00
Anatoly Bubenkov 9d4354c0a4 Merged in docs_community (pull request #254) 
added documentationo on the new pytest-dev teams on bitbucket and
 2015-02-27 14:58:27 +01:00
Anatoly Bubenkov f99ddbfdf2 Close branch docs_community 
--HG--
branch : docs_community
 2015-02-27 14:58:27 +01:00
holger krekel 019dc14fc4 fix typos, clarify git/hg 
--HG--
branch : docs_community
 2015-02-27 13:38:45 +01:00
holger krekel dbb58b39d9 switch to push to latest docs, because otherwise people get misled to old repos which don't exist anymore 
--HG--
branch : docs_community
 2015-02-27 12:53:14 +01:00
holger krekel c3ca44b46f change links to go to the new pytest-dev bitbucket team's repo location 
--HG--
branch : docs_community
 2015-02-27 12:27:40 +01:00
holger krekel f6df3b0b97 added documentationo on the new pytest-dev teams on bitbucket and 
github.  See https://pytest.org/latest/contributing.html (tentative)
Thanks to Anatoly for pushing and initial work on this.

--HG--
branch : docs_community
 2015-02-27 11:54:17 +01:00
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