merge: testing → main (reconcile 2-week divergence)

tests/service_testing/test_imap.py

@@ -1,5 +1,5 @@
 """
-Tests for templates/imap/server.py
+Tests for decnet/templates/imap/server.py
 
 Exercises the full IMAP4rev1 state machine:
   NOT_AUTHENTICATED → AUTHENTICATED → SELECTED
@@ -17,31 +17,33 @@ import pytest
 
 # ── Helpers ───────────────────────────────────────────────────────────────────
 
-def _make_fake_decnet_logging() -> ModuleType:
-    mod = ModuleType("decnet_logging")
+def _make_fake_syslog_bridge() -> ModuleType:
+    mod = ModuleType("syslog_bridge")
     mod.syslog_line = MagicMock(return_value="")
     mod.write_syslog_file = MagicMock()
     mod.forward_syslog = MagicMock()
     mod.SEVERITY_WARNING = 4
     mod.SEVERITY_INFO = 6
+    mod.encode_secret = MagicMock(return_value={"secret_printable": "", "secret_b64": ""})
+    mod.classify_authorization = MagicMock(return_value=None)
     return mod
 
 
 def _load_imap():
-    """Import imap server module, injecting a stub decnet_logging."""
+    """Import imap server module, injecting a stub syslog_bridge."""
     env = {
         "NODE_NAME": "testhost",
         "IMAP_USERS": "admin:admin123,root:toor",
         "IMAP_BANNER": "* OK [testhost] Dovecot ready.",
     }
     for key in list(sys.modules):
-        if key in ("imap_server", "decnet_logging"):
+        if key in ("imap_server", "syslog_bridge"):
             del sys.modules[key]
 
-    sys.modules["decnet_logging"] = _make_fake_decnet_logging()
+    sys.modules["syslog_bridge"] = _make_fake_syslog_bridge()
 
     spec = importlib.util.spec_from_file_location(
-        "imap_server", "templates/imap/server.py"
+        "imap_server", "decnet/templates/imap/server.py"
     )
     mod = importlib.util.module_from_spec(spec)
     with patch.dict("os.environ", env, clear=False):