eb3b989286
Close branch parametrized-fixture-override
...
--HG--
branch : parametrized-fixture-override
2015-03-12 09:40:56 -03:00
cdb46e9f16
Merged in blueyed/pytest/strip-docstrings-from-fixtures (pull request #260 )
...
Strip docstrings in output with `--fixtures`
2015-03-12 08:12:43 +01:00
ead25634fe
Merged in link-update (pull request #261 )
...
update website sidebar links for repo move
2015-03-12 08:11:46 +01:00
3f3521c826
Close branch link-update
...
--HG--
branch : link-update
2015-03-12 08:11:46 +01:00
0c2dfb9683
update website sidebar links for repo move
...
--HG--
branch : link-update
2015-03-11 20:04:14 -05:00
5d6b0a59c0
Strip docstrings in output with `--fixtures`
...
Fixes https://bitbucket.org/pytest-dev/pytest/issue/550 .
--HG--
branch : strip-docstrings-from-fixtures
2015-03-04 17:00:24 +01:00
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
b48eda6d7d
update regendocs
...
--HG--
branch : parametrized-fixture-override
2015-03-02 22:07:42 +01:00
81243657be
add docs target
...
--HG--
branch : parametrized-fixture-override
2015-03-02 21:43:31 +01:00
24fe051803
use make develop in contribution guide
...
--HG--
branch : parametrized-fixture-override
2015-03-02 20:48:09 +01:00
16bcfa749e
merge with upstream
...
--HG--
branch : parametrized-fixture-override
2015-03-02 20:18:31 +01:00
d083153548
fix typo
...
--HG--
branch : parametrized-fixture-override
2015-03-02 20:18:06 +01:00
41e6b04f0b
Merged in eks/pytest/issue616 (pull request #258 )
...
Add comments
2015-03-02 14:38:10 +01:00
33c2a3a3e5
make loop more readable
...
--HG--
branch : parametrized-fixture-override
2015-03-02 08:55:57 +01:00
97d5da5c99
Add comments
...
--HG--
branch : issue616
2015-03-01 17:32:00 -05:00
d1005ebb8f
document fixture override techniques
...
--HG--
branch : parametrized-fixture-override
2015-03-01 18:54:24 +01:00
c4623939af
support override of the parametrized fixture on the test level
...
--HG--
branch : parametrized-fixture-override
2015-03-01 15:15:37 +01:00
060609317a
allow to override parametrized fixtures with non-parametrized ones and vice versa
...
--HG--
branch : parametrized-fixture-override
2015-03-01 13:54:43 +01:00
bae0f7f46a
Merged in plugincompat-move (pull request #256 )
...
moved pytest-plugs to plugincompat
2015-02-28 21:32:57 +01:00
09a50b6e6d
Close branch plugincompat-move
...
--HG--
branch : plugincompat-move
2015-02-28 21:32:57 +01:00
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
ff9ec13ddb
mention "pytestdotorg" twitter account
2015-02-28 20:02:31 +01:00
9384ff38c9
Close branch issue616
...
--HG--
branch : issue616
2015-02-28 10:02:58 +01:00
1e6e373913
Merged in issue616 (pull request #252 )
...
fix issue616 - conftest visibility fixes.
2015-02-28 10:02:58 +01:00
e510eb0d45
a few more fixes
2015-02-27 16:42:03 +01:00
2e2d6a8bef
make "Adopt pytest" note more prominent, fix link from plugins page.
2015-02-27 15:49:25 +01:00
44cd1c9862
merge dead branch
2015-02-27 09:34:33 -05:00
f6f084fa01
close branch
...
--HG--
branch : update-issues
2015-02-27 09:34:16 -05:00
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
bda3e53df6
another update for get_issues.py to account for repository move
...
--HG--
branch : update-issues
2015-02-27 09:12:00 -05:00
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
f99ddbfdf2
Close branch docs_community
...
--HG--
branch : docs_community
2015-02-27 14:58:27 +01:00
019dc14fc4
fix typos, clarify git/hg
...
--HG--
branch : docs_community
2015-02-27 13:38:45 +01:00
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
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
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
e9d4853296
Merged contributing-community into default
2015-02-27 11:17:14 +01:00
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
8ed5b77aba
fix issue650: introduce new --doctest-ignore-import-errors option courtesy
...
of Charles Cloud.
2015-02-26 22:02:49 +01:00
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
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
c773ea664b
Add test for command line usage
...
--HG--
branch : ignore-doctest-import-errors
2015-02-26 12:39:36 -05:00
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
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
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
f1c9554f42
merge
2015-02-22 12:29:26 +01:00
3d0b756877
merge in the 2.6 maintenance branch
2015-02-22 11:45:07 +01:00
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
777bde7c60
Remove xfail_if_pdbpp_installed from test_pdb.py
...
--HG--
branch : remove_pdbpp_xfail
2015-02-19 03:22:05 -08:00
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
Bruno Oliveira
Anatoly Bubenkov
Benjamin Peterson
Daniel Hahler
Ronny Pfannschmidt
Eric Siegerman
holger krekel
Phillip Cloud
Marc Abramowitz