feat: simplify plugin tests; fix plugin resetting (#819)

Author: jakelorocco

test/plugins/conftest.py

@@ -0,0 +1,35 @@
+"""Shared fixtures for plugin tests."""
+
+import pytest
+
+from mellea.plugins.manager import has_plugins, shutdown_plugins
+
+
+@pytest.fixture(autouse=True, scope="package")
+async def _restore_plugins_after_package(request):
+    """Re-register acceptance sets once after all plugin tests finish.
+
+    Plugin tests freely shut down the manager for isolation.  This package-scoped
+    fixture captures whether plugins were active at the start and restores them in
+    teardown so that test modules collected *after* ``test/plugins/`` still see the
+    session-scoped acceptance sets registered by ``auto_register_acceptance_sets``.
+    """
+    plugins_disabled = request.config.getoption(
+        "--disable-default-mellea-plugins", default=False
+    )
+    was_enabled = has_plugins()
+    yield
+    if was_enabled and not plugins_disabled:
+        from mellea.plugins import register
+        from test.plugins._acceptance_sets import ALL_ACCEPTANCE_SETS
+
+        for ps in ALL_ACCEPTANCE_SETS:
+            register(ps)
+
+
+@pytest.fixture(autouse=True)
+async def reset_plugins():
+    """Shut down plugins before and after each test for isolation."""
+    await shutdown_plugins()
+    yield
+    await shutdown_plugins()

test/plugins/test_blocking.py

@@ -18,7 +18,7 @@
 from mellea.plugins.base import PluginViolationError
 from mellea.plugins.context import build_global_context
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import ensure_plugin_manager, invoke_hook, shutdown_plugins
+from mellea.plugins.manager import ensure_plugin_manager, invoke_hook
 from mellea.plugins.types import HookType
 
 # ---------------------------------------------------------------------------
@@ -52,18 +52,6 @@ async def _invoke_no_raise(payload: SessionPreInitPayload):
     return result
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    """Shut down and reset the plugin manager after every test."""
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # TestBlockHelper
 # ---------------------------------------------------------------------------

test/plugins/test_execution_modes.py

@@ -31,7 +31,7 @@
 from mellea.plugins.base import PluginViolationError
 from mellea.plugins.hooks.generation import GenerationPreCallPayload
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import invoke_hook, shutdown_plugins
+from mellea.plugins.manager import invoke_hook
 from mellea.plugins.types import HookType, PluginMode
 
 # ---------------------------------------------------------------------------
@@ -53,18 +53,6 @@ def _generation_payload(**kwargs) -> GenerationPreCallPayload:
     return GenerationPreCallPayload(**defaults)
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def cleanup_plugins():
-    """Reset plugin manager state after every test."""
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # Enforce mode
 # ---------------------------------------------------------------------------

test/plugins/test_hook_call_sites.py

@@ -29,7 +29,6 @@
     ModelOutputThunk,
 )
 from mellea.plugins import PluginResult, hook, register
-from mellea.plugins.manager import shutdown_plugins
 from mellea.stdlib.context import SimpleContext
 
 # ---------------------------------------------------------------------------
@@ -89,18 +88,6 @@ def _make_thunk():
     return mot
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    """Shut down and reset the plugin manager after every test."""
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # Generation hook call sites
 # ---------------------------------------------------------------------------

test/plugins/test_manager.py

@@ -3,47 +3,24 @@
 import pytest
 
 from mellea.plugins.base import MelleaBasePayload
-from mellea.plugins.manager import (
-    ensure_plugin_manager,
-    has_plugins,
-    invoke_hook,
-    shutdown_plugins,
-)
+from mellea.plugins.manager import ensure_plugin_manager, has_plugins, invoke_hook
 from mellea.plugins.types import HookType, PluginMode
 
 # These tests require the contextforge plugin framework
 pytest.importorskip("cpex.framework")
 
 
-@pytest.fixture(autouse=True)
-async def cleanup_plugins():
-    """Ensure plugin manager is shut down after each test."""
-    yield
-    await shutdown_plugins()
-
-
 class TestNoOpGuards:
     @pytest.mark.asyncio
-    async def test_invoke_hook_noop_when_no_plugins(self, request):
+    async def test_invoke_hook_noop_when_no_plugins(self):
         """When no plugins are registered, invoke_hook returns (None, original_payload)."""
-        plugins_disabled = request.config.getoption(
-            "--disable-default-mellea-plugins", default=False
-        )
-        if not plugins_disabled:
-            pytest.skip("must pass --disable-default-mellea-plugins for this test")
         payload = MelleaBasePayload(request_id="test-123")
         result, returned_payload = await invoke_hook(HookType.SESSION_PRE_INIT, payload)
         assert result is None
         assert returned_payload is payload
 
-    def test_has_plugins_false_by_default(self, request):
+    def test_has_plugins_false_by_default(self):
         """has_plugins() returns False when no plugins have been registered."""
-        plugins_disabled = request.config.getoption(
-            "--disable-default-mellea-plugins", default=False
-        )
-        if not plugins_disabled:
-            pytest.skip("must pass --disable-default-mellea-plugins for this test")
-        # After shutdown, plugins should not be enabled
         assert not has_plugins()
 
 

test/plugins/test_mellea_plugin.py

@@ -11,16 +11,10 @@
 
 from mellea.plugins import Plugin, hook, register
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import invoke_hook, shutdown_plugins
+from mellea.plugins.manager import invoke_hook
 from mellea.plugins.types import HookType
 
 
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    yield
-    await shutdown_plugins()
-
-
 def _make_payload() -> SessionPreInitPayload:
     return SessionPreInitPayload(
         backend_name="test", model_id="test-model", model_options=None

test/plugins/test_policy_enforcement.py

@@ -17,7 +17,7 @@
 from mellea.plugins.hooks.generation import GenerationPreCallPayload
 from mellea.plugins.hooks.sampling import SamplingIterationPayload
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import invoke_hook, shutdown_plugins
+from mellea.plugins.manager import invoke_hook
 from mellea.plugins.types import HookType
 
 # ---------------------------------------------------------------------------
@@ -39,18 +39,6 @@ def _generation_payload(**kwargs) -> GenerationPreCallPayload:
     return GenerationPreCallPayload(**defaults)
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    """Shut down and reset the plugin manager after every test."""
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # TestWritableFieldAccepted
 # ---------------------------------------------------------------------------

test/plugins/test_priority_ordering.py

@@ -17,7 +17,7 @@
 
 from mellea.plugins import Plugin, PluginSet, hook, register
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import invoke_hook, shutdown_plugins
+from mellea.plugins.manager import invoke_hook
 from mellea.plugins.types import HookType
 
 # ---------------------------------------------------------------------------
@@ -31,18 +31,6 @@ def _session_payload() -> SessionPreInitPayload:
     )
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def cleanup_plugins():
-    """Reset plugin manager state after every test."""
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # Priority ordering
 # ---------------------------------------------------------------------------

test/plugins/test_scoping.py

@@ -9,21 +9,10 @@
 from mellea.plugins import Plugin, PluginSet, hook, plugin_scope, register
 from mellea.plugins.base import MelleaPlugin, PluginResult
 from mellea.plugins.hooks.session import SessionPreInitPayload
-from mellea.plugins.manager import (
-    deregister_session_plugins,
-    invoke_hook,
-    shutdown_plugins,
-)
+from mellea.plugins.manager import deregister_session_plugins, invoke_hook
 from mellea.plugins.types import HookType
 
 
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    """Reset the plugin manager to a clean state after every test."""
-    yield
-    await shutdown_plugins()
-
-
 def _payload() -> SessionPreInitPayload:
     return SessionPreInitPayload(
         backend_name="test-backend", model_id="test-model", model_options=None

test/plugins/test_tool_hooks_redaction.py

@@ -19,7 +19,6 @@
 
 from mellea.core.base import AbstractMelleaTool, ModelOutputThunk, ModelToolCall
 from mellea.plugins import PluginResult, hook, register
-from mellea.plugins.manager import shutdown_plugins
 from mellea.plugins.types import HookType
 from mellea.stdlib.functional import _acall_tools
 
@@ -52,17 +51,6 @@ def _make_result(tool_call: ModelToolCall) -> ModelOutputThunk:
     return mot
 
 
-# ---------------------------------------------------------------------------
-# Fixtures
-# ---------------------------------------------------------------------------
-
-
-@pytest.fixture(autouse=True)
-async def reset_plugins():
-    yield
-    await shutdown_plugins()
-
-
 # ---------------------------------------------------------------------------
 # Tests
 # ---------------------------------------------------------------------------