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.

Sign up for GitHub

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

Fix test failures after pluggy 1.8 release #4816

Merged
merged 1 commit into from
Feb 23, 2019
Merged

Fix test failures after pluggy 1.8 release #4816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion testing/test_assertion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ def load(self, require=True, *args, **kwargs):
import spamplugin
return spamplugin

def iter_entry_points(name):
def iter_entry_points(group, name=None):
yield DummyEntryPoint()

pkg_resources.iter_entry_points = iter_entry_points
Expand Down
14 changes: 7 additions & 7 deletions testing/test_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,8 @@ def test_preparse_ordering_with_setuptools(testdir, monkeypatch):
pkg_resources = pytest.importorskip("pkg_resources")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)

def my_iter(name):
assert name == "pytest11"
def my_iter(group, name=None):
assert group == "pytest11"

class Dist(object):
project_name = "spam"
Expand Down Expand Up @@ -552,8 +552,8 @@ def test_setuptools_importerror_issue1479(testdir, monkeypatch):
pkg_resources = pytest.importorskip("pkg_resources")
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)

def my_iter(name):
assert name == "pytest11"
def my_iter(group, name=None):
assert group == "pytest11"

class Dist(object):
project_name = "spam"
Expand Down Expand Up @@ -583,8 +583,8 @@ def test_plugin_preparse_prevents_setuptools_loading(testdir, monkeypatch, block

plugin_module_placeholder = object()

def my_iter(name):
assert name == "pytest11"
def my_iter(group, name=None):
assert group == "pytest11"

class Dist(object):
project_name = "spam"
Expand Down Expand Up @@ -621,7 +621,7 @@ def load(self):
def test_disable_plugin_autoload(testdir, monkeypatch, parse_args, should_load):
pkg_resources = pytest.importorskip("pkg_resources")

def my_iter(name):
def my_iter(group, name=None):
raise AssertionError("Should not be called")

class PseudoPlugin(object):
Expand Down