Skip to content

Commit 19a7633

Browse files
committed
add pluginmanager.do_configure(config) as a link to
config.do_configure() for plugin-compatibility add some more plugins to plugin-test.sh
1 parent 0780f25 commit 19a7633

File tree

4 files changed

+12
-2
lines changed

4 files changed

+12
-2
lines changed

CHANGELOG

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@ Changes between 2.4.1 and 2.4.2
2121
details of the node.keywords pseudo-dicts. Adapated
2222
docs.
2323

24-
2524
- remove attempt to "dup" stdout at startup as it's icky.
2625
the normal capturing should catch enough possibilities
2726
of tests messing up standard FDs.
2827

28+
- add pluginmanager.do_configure(config) as a link to
29+
config.do_configure() for plugin-compatibility
30+
2931
Changes between 2.4.0 and 2.4.1
3032
-----------------------------------
3133

_pytest/core.py

+4
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,10 @@ def __init__(self, hookspecs=None):
7676
self._shutdown = []
7777
self.hook = HookRelay(hookspecs or [], pm=self)
7878

79+
def do_configure(self, config):
80+
# backward compatibility
81+
config.do_configure()
82+
7983
def set_register_callback(self, callback):
8084
assert not hasattr(self, "_registercallback")
8185
self._registercallback = callback

plugin-test.sh

+4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ cd ../pytest-instafail
99
py.test
1010
cd ../pytest-cache
1111
py.test
12+
cd ../pytest-xprocess
13+
py.test
1214
#cd ../pytest-cov
1315
#py.test
16+
cd ../pytest-capturelog
17+
py.test
1418
cd ../pytest-xdist
1519
py.test
1620

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
long_description = open("README.rst").read()
55
def main():
6-
install_requires = ["py>=1.4.17.dev2"]
6+
install_requires = ["py>=1.4.17"]
77
if sys.version_info < (2,7):
88
install_requires.append("argparse")
99
if sys.platform == "win32":

0 commit comments

Comments
 (0)