diff --git a/pytest/_core.py b/pytest/_core.py index 4022af993..f955c7fb5 100644 --- a/pytest/_core.py +++ b/pytest/_core.py @@ -115,10 +115,6 @@ class PluginManager(object): self.import_plugin(opt2) 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__): self.consider_module(conftestmodule) diff --git a/testing/test_pluginmanager.py b/testing/test_pluginmanager.py index 26d682dde..023b36eb1 100644 --- a/testing/test_pluginmanager.py +++ b/testing/test_pluginmanager.py @@ -129,11 +129,6 @@ class TestBootstrapping: l = reprec.getcalls("pytest_plugin_registered") 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): config = testdir.parseconfig([]) assert config._conftest._onimport == config._onimportconftest