Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pluginmanager.consider_preparse: add exclude_only kwarg #6443

Merged
merged 1 commit into from Feb 3, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions changelog/6443.breaking.rst
@@ -0,0 +1,3 @@
Plugins specified with ``-p`` are now loaded after internal plugins, which results in their hooks being called *before* the internal ones.

This makes the ``-p`` behavior consistent with ``PYTEST_PLUGINS``.
8 changes: 5 additions & 3 deletions src/_pytest/config/__init__.py
Expand Up @@ -193,7 +193,7 @@ def get_config(args=None, plugins=None):

if args is not None:
# Handle any "-p no:plugin" args.
pluginmanager.consider_preparse(args)
pluginmanager.consider_preparse(args, exclude_only=True)

for spec in default_plugins:
pluginmanager.import_plugin(spec)
Expand Down Expand Up @@ -499,7 +499,7 @@ def _importconftest(self, conftestpath):
#
#

def consider_preparse(self, args):
def consider_preparse(self, args, *, exclude_only=False):
i = 0
n = len(args)
while i < n:
Expand All @@ -516,6 +516,8 @@ def consider_preparse(self, args):
parg = opt[2:]
else:
continue
if exclude_only and not parg.startswith("no:"):
continue
self.consider_pluginarg(parg)

def consider_pluginarg(self, arg):
Expand Down Expand Up @@ -951,7 +953,7 @@ def _preparse(self, args: List[str], addopts: bool = True) -> None:

self._checkversion()
self._consider_importhook(args)
self.pluginmanager.consider_preparse(args)
self.pluginmanager.consider_preparse(args, exclude_only=False)
if not os.environ.get("PYTEST_DISABLE_PLUGIN_AUTOLOAD"):
# Don't autoload from setuptools entry point. Only explicitly specified
# plugins are going to be loaded.
Expand Down
13 changes: 12 additions & 1 deletion testing/test_config.py
Expand Up @@ -659,6 +659,13 @@ class Distribution:
class PseudoPlugin:
x = 42

attrs_used = []

def __getattr__(self, name):
assert name == "__loader__"
self.attrs_used.append(name)
return object()

def distributions():
return (Distribution(),)

Expand All @@ -668,6 +675,10 @@ def distributions():
config = testdir.parseconfig(*parse_args)
has_loaded = config.pluginmanager.get_plugin("mytestplugin") is not None
assert has_loaded == should_load
if should_load:
assert PseudoPlugin.attrs_used == ["__loader__"]
else:
assert PseudoPlugin.attrs_used == []


def test_plugin_loading_order(testdir):
Expand All @@ -676,7 +687,7 @@ def test_plugin_loading_order(testdir):
"""
def test_terminal_plugin(request):
import myplugin
assert myplugin.terminal_plugin == [True, True]
assert myplugin.terminal_plugin == [False, True]
""",
**{
"myplugin": """
Expand Down
5 changes: 1 addition & 4 deletions testing/test_warnings.py
Expand Up @@ -679,10 +679,7 @@ def test_issue4445_import_plugin(self, testdir, capwarn):
# with stacklevel=2 the warning should originate from
# config.PytestPluginManager.import_plugin is thrown by a skipped plugin

# During config parsing the the pluginargs are checked in a while loop
# that as a result of the argument count runs import_plugin twice, hence
# two identical warnings are captured (is this intentional?).
assert len(capwarn.captured) == 2
assert len(capwarn.captured) == 1
warning, location = capwarn.captured.pop()
file, _, func = location

Expand Down