Permalink
Browse files

Only consider actual functions when considering hooks

  • Loading branch information...
nicoddemus authored and hsoft committed Aug 4, 2018
1 parent 2073630 commit a3c7e8d9372a8b1c8b4d2e9ee0ba9de6ec1f005f
@@ -0,0 +1 @@
Fix bug where importing modules or other objects with prefix ``pytest_`` prefix would raise a ``PluginValidationError``.
@@ -1,6 +1,7 @@
""" command line options, ini-file and conftest.py processing. """
from __future__ import absolute_import, division, print_function
import argparse
import inspect
import shlex
import traceback
import types
@@ -252,6 +253,10 @@ def parse_hookimpl_opts(self, plugin, name):
method = getattr(plugin, name)
opts = super(PytestPluginManager, self).parse_hookimpl_opts(plugin, name)
# consider only actual functions for hooks (#3775)
if not inspect.isroutine(method):
return
# collect unmarked hooks as long as they have the `pytest_' prefix
if opts is None and name.startswith("pytest_"):
opts = {}
@@ -0,0 +1,2 @@
class pytest_something(object):
pass
@@ -0,0 +1,2 @@
def test_foo():
pass
View
@@ -745,6 +745,24 @@ def test_get_plugin_specs_as_list():
assert _get_plugin_specs_as_list(("foo", "bar")) == ["foo", "bar"]
def test_collect_pytest_prefix_bug_integration(testdir):
"""Integration test for issue #3775"""
p = testdir.copy_example("config/collect_pytest_prefix")
result = testdir.runpytest(p)
result.stdout.fnmatch_lines("* 1 passed *")
def test_collect_pytest_prefix_bug(pytestconfig):
"""Ensure we collect only actual functions from conftest files (#3775)"""
class Dummy(object):
class pytest_something(object):
pass
pm = pytestconfig.pluginmanager
assert pm.parse_hookimpl_opts(Dummy(), "pytest_something") is None
class TestWarning(object):
def test_warn_config(self, testdir):
testdir.makeconftest(

0 comments on commit a3c7e8d

Please sign in to comment.