diff --git a/_pytest/config.py b/_pytest/config.py index 739cc279b..095bf1595 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -208,8 +208,6 @@ class PytestPluginManager(PluginManager): try: mod = importplugin(modname) except ImportError: - if modname.startswith("pytest_"): - return self.import_plugin(modname[7:]) raise except Exception as e: import pytest diff --git a/testing/test_pytester.py b/testing/test_pytester.py index 3eb2b47c1..5478b2df8 100644 --- a/testing/test_pytester.py +++ b/testing/test_pytester.py @@ -64,7 +64,7 @@ def test_parseconfig(testdir): def test_testdir_runs_with_plugin(testdir): testdir.makepyfile(""" - pytest_plugins = "pytest_pytester" + pytest_plugins = "pytester" def test_hello(testdir): assert 1 """) diff --git a/testing/test_recwarn.py b/testing/test_recwarn.py index d8fe1784e..5a2bf92fa 100644 --- a/testing/test_recwarn.py +++ b/testing/test_recwarn.py @@ -22,7 +22,6 @@ def test_WarningRecorder(recwarn): def test_recwarn_functional(testdir): reprec = testdir.inline_runsource(""" - pytest_plugins = 'pytest_recwarn', import warnings oldwarn = warnings.showwarning def test_method(recwarn): diff --git a/testing/test_unittest.py b/testing/test_unittest.py index 9c342976b..f7bbb1545 100644 --- a/testing/test_unittest.py +++ b/testing/test_unittest.py @@ -3,7 +3,6 @@ import pytest def test_simple_unittest(testdir): testpath = testdir.makepyfile(""" import unittest - pytest_plugins = "pytest_unittest" class MyTestCase(unittest.TestCase): def testpassing(self): self.assertEquals('foo', 'foo') @@ -17,7 +16,6 @@ def test_simple_unittest(testdir): def test_runTest_method(testdir): testdir.makepyfile(""" import unittest - pytest_plugins = "pytest_unittest" class MyTestCaseWithRunTest(unittest.TestCase): def runTest(self): self.assertEquals('foo', 'foo')