floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove feature deprecated prior even to 1.0

This commit is contained in:
holger krekel 2010-10-31 18:46:10 +01:00
parent c92365f8dd
commit 35969e13ae
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pytest/_core.py
View File

@ -115,10 +115,6 @@ class PluginManager(object):
self.import_plugin(opt2) self.import_plugin(opt2)
def consider_conftest(self, conftestmodule): def consider_conftest(self, conftestmodule):
cls = getattr(conftestmodule, 'ConftestPlugin', None)
if cls is not None:
raise ValueError("%r: 'ConftestPlugins' only existed till 1.0.0b1, "
"were removed in 1.0.0b2" % (cls,))
if self.register(conftestmodule, name=conftestmodule.__file__): if self.register(conftestmodule, name=conftestmodule.__file__):
self.consider_module(conftestmodule) self.consider_module(conftestmodule)

5
testing/test_pluginmanager.py
View File

@ -129,11 +129,6 @@ class TestBootstrapping:
l = reprec.getcalls("pytest_plugin_registered") l = reprec.getcalls("pytest_plugin_registered")
assert len(l) == 1 assert len(l) == 1
def test_consider_conftest_deprecated(self, testdir):
pp = PluginManager()
mod = testdir.makepyfile("class ConftestPlugin: pass").pyimport()
call = py.test.raises(ValueError, pp.consider_conftest, mod)
def test_config_sets_conftesthandle_onimport(self, testdir): def test_config_sets_conftesthandle_onimport(self, testdir):
config = testdir.parseconfig([]) config = testdir.parseconfig([])
assert config._conftest._onimport == config._onimportconftest assert config._conftest._onimport == config._onimportconftest