tests/unit/_docker_bottle_plan.py

@@ -23,6 +23,10 @@ SLUG = "demo-abc12"
 STAGE = Path("/tmp/cb-stage")
 STATE = Path("/tmp/cb-state")
 
+# Exported to consumers (e.g. test_consolidated_compose); named with a
+# leading underscore for the historical fixture convention.
+__all__ = ["_plan"]
+
 
 def _manifest(*, supervise: bool, with_git: bool, with_egress: bool) -> ManifestIndex:
     """Minimal manifest with the toggles the matrix needs. The renderer

tests/unit/test_egress_apply.py

@@ -5,8 +5,6 @@ integration test)."""
 import tempfile
 import unittest
 from pathlib import Path
-from types import SimpleNamespace
-from unittest.mock import patch
 
 from tests.unit import use_bottle_root
 from bot_bottle.backend.egress_apply import EgressApplyError