Skip to content

Commit b157cef

Browse files
committed
Simplify plugin name in test_installed_plugin_rewrite
1 parent 98f940c commit b157cef

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

testing/test_assertion.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,7 @@ def test_installed_plugin_rewrite(
238238
assert disable_plugin_autoload == ""
239239
monkeypatch.delenv("PYTEST_DISABLE_PLUGIN_AUTOLOAD", raising=False)
240240

241-
# FIXME: if it's already loaded then you get a ValueError: "Plugin already
242-
# registered under a different name."
243-
# vaguely related to https://github.com/pytest-dev/pytest/issues/5661
244-
name = "spamplugin" if disable_plugin_autoload else "spam"
245-
# is there a single dotted name that can be used either way? idk
241+
name = "spamplugin"
246242

247243
if explicit_specify == "env_var":
248244
monkeypatch.setenv("PYTEST_PLUGINS", name)
@@ -280,7 +276,7 @@ def check(values, value):
280276
import pytest
281277
282278
class DummyEntryPoint(object):
283-
name = 'spam'
279+
name = 'spamplugin'
284280
module_name = 'spam.py'
285281
group = 'pytest11'
286282

0 commit comments

Comments
 (0)