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

tests/service_testing/test_mysql.py

@@ -1,5 +1,5 @@
 """
-Tests for templates/mysql/server.py
+Tests for decnet/templates/mysql/server.py
 
 Covers the MySQL handshake happy path and regression tests for oversized
 length fields that could cause huge buffer allocations.
@@ -14,17 +14,22 @@ import pytest
 from hypothesis import given, settings
 from hypothesis import strategies as st
 
-from .conftest import _FUZZ_SETTINGS, make_fake_decnet_logging, run_with_timeout
+from .conftest import (
+    _FUZZ_SETTINGS,
+    load_real_instance_seed,
+    make_fake_syslog_bridge,
+    run_with_timeout,
+)
 
 
 # ── Helpers ───────────────────────────────────────────────────────────────────
 
 def _load_mysql():
-    for key in list(sys.modules):
-        if key in ("mysql_server", "decnet_logging"):
-            del sys.modules[key]
-    sys.modules["decnet_logging"] = make_fake_decnet_logging()
-    spec = importlib.util.spec_from_file_location("mysql_server", "templates/mysql/server.py")
+    for key in ("mysql_server", "syslog_bridge", "instance_seed"):
+        sys.modules.pop(key, None)
+    sys.modules["syslog_bridge"] = make_fake_syslog_bridge()
+    sys.modules["instance_seed"] = load_real_instance_seed()
+    spec = importlib.util.spec_from_file_location("mysql_server", "decnet/templates/mysql/server.py")
     mod = importlib.util.module_from_spec(spec)
     spec.loader.exec_module(mod)
     return mod
@@ -33,6 +38,7 @@ def _load_mysql():
 def _make_protocol(mod):
     proto = mod.MySQLProtocol()
     transport = MagicMock()
+    transport.is_closing.return_value = False
     written: list[bytes] = []
     transport.write.side_effect = written.append
     proto.connection_made(transport)
@@ -66,6 +72,7 @@ def mysql_mod():
 def test_connection_sends_greeting(mysql_mod):
     proto = mysql_mod.MySQLProtocol()
     transport = MagicMock()
+    transport.is_closing.return_value = False
     written: list[bytes] = []
     transport.write.side_effect = written.append
     proto.connection_made(transport)
@@ -89,7 +96,7 @@ def test_login_packet_returns_access_denied(mysql_mod):
 
 def test_login_logs_username():
     mod = _load_mysql()
-    log_mock = sys.modules["decnet_logging"]
+    log_mock = sys.modules["syslog_bridge"]
     proto, _, _ = _make_protocol(mod)
     proto.data_received(_login_packet(username="hacker"))
     calls_str = str(log_mock.syslog_line.call_args_list)