Had codex fix up tests.

tests/test_compositor_state_adapter_regressions.py

@@ -7,13 +7,33 @@ from unittest import mock
 
 sys.path.insert(0, str(Path(__file__).resolve().parents[1] / "src"))
 
+import cthulhu as cthulhu_package
+
 from cthulhu import cthulhu_state
-from cthulhu import cthulhu
 from cthulhu import compositor_state_adapter
 from cthulhu import compositor_state_types
 from cthulhu import compositor_state_wayland
+
+stubCthulhu = types.ModuleType("cthulhu.cthulhu")
+stubCthulhu.cthulhuApp = mock.Mock()
+previousCthulhuModule = sys.modules.get("cthulhu.cthulhu")
+sys.modules.setdefault("cthulhu.cthulhu", stubCthulhu)
+
+from cthulhu import event_manager
 from cthulhu.wayland_protocols import ext_workspace_v1
 
+if previousCthulhuModule is None:
+    sys.modules.pop("cthulhu.cthulhu", None)
+    if getattr(cthulhu_package, "cthulhu", None) is stubCthulhu:
+        delattr(cthulhu_package, "cthulhu")
+    from cthulhu import cthulhu as restoredCthulhuModule
+else:
+    sys.modules["cthulhu.cthulhu"] = previousCthulhuModule
+    cthulhu_package.cthulhu = previousCthulhuModule
+    restoredCthulhuModule = previousCthulhuModule
+
+event_manager.cthulhu = restoredCthulhuModule
+
 
 class FakeWorkspaceBackend:
     def __init__(self, available: bool, name: str) -> None:
@@ -313,23 +333,38 @@ class CompositorStateAdapterRegressionTests(unittest.TestCase):
         adapter = mock.Mock()
         adapter.sync_accessible_context = mock.Mock(return_value=None)
         listener = mock.Mock()
+        fakeAtspi = types.SimpleNamespace(
+            EventListener=types.SimpleNamespace(new=mock.Mock(return_value=listener)),
+        )
+        fakeCthulhu = types.SimpleNamespace(
+            setActiveWindow=mock.Mock(),
+            setLocusOfFocus=mock.Mock(),
+        )
         window = object()
         focusedObject = object()
 
         with (
-            mock.patch.object(cthulhu.event_manager.Atspi.EventListener, "new", return_value=listener),
-            mock.patch.object(cthulhu.event_manager.AXUtilities, "can_be_active_window", return_value=False),
-            mock.patch.object(cthulhu.event_manager.AXUtilities, "find_active_window", return_value=window),
-            mock.patch.object(cthulhu.event_manager.AXUtilities, "get_focused_object", return_value=focusedObject),
-            mock.patch.object(cthulhu.event_manager.cthulhu, "setActiveWindow") as setActiveWindow,
-            mock.patch.object(cthulhu.event_manager.cthulhu, "setLocusOfFocus") as setLocusOfFocus,
+            mock.patch.object(event_manager, "Atspi", fakeAtspi),
+            mock.patch.object(event_manager.AXUtilities, "can_be_active_window", return_value=False),
+            mock.patch.object(event_manager.AXUtilities, "find_active_window", return_value=window),
+            mock.patch.object(event_manager.AXUtilities, "get_focused_object", return_value=focusedObject),
+            mock.patch.object(event_manager, "cthulhu", fakeCthulhu),
         ):
-            manager = cthulhu.event_manager.EventManager(mock.Mock())
+            manager = event_manager.EventManager(mock.Mock())
             manager.set_compositor_state_adapter(adapter)
             manager._sync_focus_on_startup()
 
-        setActiveWindow.assert_called_once_with(window, alsoSetLocusOfFocus=True, notifyScript=False)
-        setLocusOfFocus.assert_called_once_with(None, focusedObject, notifyScript=True, force=True)
+        fakeCthulhu.setActiveWindow.assert_called_once_with(
+            window,
+            alsoSetLocusOfFocus=True,
+            notifyScript=False,
+        )
+        fakeCthulhu.setLocusOfFocus.assert_called_once_with(
+            None,
+            focusedObject,
+            notifyScript=True,
+            force=True,
+        )
         adapter.sync_accessible_context.assert_called_once_with("event-manager-startup")