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

tests/service_testing/test_mqtt_fuzz.py

@@ -1,5 +1,5 @@
 """
-Tests for templates/mqtt/server.py — protocol boundary and fuzz cases.
+Tests for decnet/templates/mqtt/server.py — protocol boundary and fuzz cases.
 
 Focuses on the variable-length remaining-length field (MQTT spec: max 4 bytes).
 A 5th continuation byte used to cause the server to get stuck waiting for a
@@ -15,17 +15,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_mqtt():
-    for key in list(sys.modules):
-        if key in ("mqtt_server", "decnet_logging"):
-            del sys.modules[key]
-    sys.modules["decnet_logging"] = make_fake_decnet_logging()
-    spec = importlib.util.spec_from_file_location("mqtt_server", "templates/mqtt/server.py")
+    for key in ("mqtt_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("mqtt_server", "decnet/templates/mqtt/server.py")
     mod = importlib.util.module_from_spec(spec)
     with patch.dict("os.environ", {"MQTT_ACCEPT_ALL": "1", "MQTT_PERSONA": "water_plant"}, clear=False):
         spec.loader.exec_module(mod)