storm/cthulhu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: harden Wayland compositor runtime checks

Browse Source
This commit is contained in:
Hunter Jozwiak
2026-04-09 12:01:09 -04:00
parent 8fc77c5a2f
commit 5bb5f3d711
3 changed files with 93 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/test_event_manager_compositor_context_regressions.py
+62
View File
@@ -27,6 +27,12 @@ class FakeEvent:
class EventManagerCompositorContextRegressionTests(unittest.TestCase):
def setUp(self) -> None:
self.originalPauseAtspiChurn = cthulhu_state.pauseAtspiChurn
self.originalPrioritizedDesktopContextToken = cthulhu_state.prioritizedDesktopContextToken
self.originalCompositorSnapshot = cthulhu_state.compositorSnapshot
self.originalActiveScript = cthulhu_state.activeScript
self.addCleanup(self._restore_cthulhu_state)
self.listener = mock.Mock()
self.listenerPatch = mock.patch.object(
event_manager.Atspi.EventListener,
@@ -42,6 +48,13 @@ class EventManagerCompositorContextRegressionTests(unittest.TestCase):
cthulhu_state.pauseAtspiChurn = False
cthulhu_state.prioritizedDesktopContextToken = None
cthulhu_state.compositorSnapshot = None
cthulhu_state.activeScript = None
def _restore_cthulhu_state(self) -> None:
cthulhu_state.pauseAtspiChurn = self.originalPauseAtspiChurn
cthulhu_state.prioritizedDesktopContextToken = self.originalPrioritizedDesktopContextToken
cthulhu_state.compositorSnapshot = self.originalCompositorSnapshot
cthulhu_state.activeScript = self.originalActiveScript
def test_set_compositor_state_adapter_registers_compositor_listener(self) -> None:
adapter = mock.Mock()
@@ -142,6 +155,55 @@ class EventManagerCompositorContextRegressionTests(unittest.TestCase):
adapter.sync_accessible_context.assert_called_once_with("object:state-changed:focused")
def test_steam_children_changed_burst_is_suppressed_before_flood_threshold(self) -> None:
app = object()
cthulhu_state.activeScript = mock.Mock(app=app)
firstEvent = FakeEvent("object:children-changed:add", source="steam-context", any_data=object())
secondEvent = FakeEvent("object:children-changed:add", source="steam-context", any_data=object())
with (
mock.patch.object(event_manager.time, "monotonic", side_effect=[100.0, 100.05]),
mock.patch.object(event_manager.debug, "printMessage"),
mock.patch.object(event_manager.debug, "printTokens"),
mock.patch.object(event_manager.debug, "print_log"),
mock.patch.object(event_manager.AXObject, "get_application", return_value=app),
mock.patch.object(event_manager.AXObject, "get_name", return_value="steamwebhelper"),
mock.patch.object(event_manager.AXObject, "get_role", return_value=mock.Mock()),
mock.patch.object(event_manager.AXObject, "is_dead", return_value=False),
mock.patch.object(event_manager.AXUtilities, "has_no_state", return_value=False),
mock.patch.object(event_manager.AXUtilities, "is_defunct", return_value=False),
mock.patch.object(event_manager.AXUtilities, "manages_descendants", return_value=False),
mock.patch.object(event_manager.AXUtilities, "is_image", return_value=False),
mock.patch.object(event_manager.AXUtilities, "is_menu_item", return_value=False),
):
self.manager._isSteamApp = mock.Mock(return_value=True)
self.manager._isSteamNotificationEvent = mock.Mock(return_value=False)
self.assertFalse(self.manager._ignore(firstEvent))
self.assertTrue(self.manager._ignore(secondEvent))
def test_steam_focus_lost_burst_is_ignored_but_focus_gain_is_preserved(self) -> None:
app = object()
cthulhu_state.activeScript = mock.Mock(app=app)
focusLost = FakeEvent("object:state-changed:focused", source="steam-context", detail1=0)
focusGained = FakeEvent("object:state-changed:focused", source="steam-context", detail1=1)
with (
mock.patch.object(event_manager.debug, "printMessage"),
mock.patch.object(event_manager.debug, "printTokens"),
mock.patch.object(event_manager.debug, "print_log"),
mock.patch.object(event_manager.AXObject, "get_application", return_value=app),
mock.patch.object(event_manager.AXObject, "get_name", return_value="steamwebhelper"),
mock.patch.object(event_manager.AXObject, "get_role", return_value=mock.Mock()),
mock.patch.object(event_manager.AXUtilities, "has_no_state", return_value=False),
mock.patch.object(event_manager.AXUtilities, "is_defunct", return_value=False),
):
self.manager._isSteamApp = mock.Mock(return_value=True)
self.manager._isSteamNotificationEvent = mock.Mock(return_value=False)
self.assertTrue(self.manager._ignore(focusLost))
self.assertFalse(self.manager._ignore(focusGained))
if __name__ == "__main__":
unittest.main()