mirror of
https://github.com/conorluddy/ios-simulator-skill.git
synced 2026-09-14 20:07:12 +08:00
Conor Luddy
f4bcf88826
Pre-fix: passing --bundle-id appended (process == <app>) AND to the os_log predicate. The default hang predicate matches RunningBoard/SpringBoard/watchdog events that originate outside the target app's process, so the AND silently dropped the bulk of useful hang signal. Verified on Grapla: a 4-minute session with --bundle-id com.conorluddy.grapla captured 0 events while the simulator was actively logging hangs. Fix: predicate stays simulator-global; bundle filtering applied post-parse against the event's process field. Mirrors the existing _matches_bundle path in the legacy --watch/--since modes; promoted to module-level matches_bundle() so the HangBuster worker reuses it. - _resolve_predicate signature simplified: drops bundle_id arg entirely. Adding it back would resurrect the bug — locked down by test. - Worker (run_worker) applies matches_bundle() after parse, before matched++. - --bundle-id help text updated to clarify it's a post-parse filter. - HangWatcher._matches_bundle becomes a thin delegator (legacy callers). Tests: 8 new in tests/test_predicate.py — predicate composition, env var precedence, signature lockdown, post-parse match behaviour. 115 → 123 passing.
72 lines
2.3 KiB
Python
72 lines
2.3 KiB
Python
"""Regression tests for #83 — `--bundle-id` must not narrow the os_log predicate.
|
|
|
|
The default hang predicate matches RunningBoard / SpringBoard / watchdog events
|
|
that originate outside the target app's process. Pre-#83, passing `--bundle-id`
|
|
ANDed `process == <app>` into the predicate and silently dropped the bulk of
|
|
useful hang signal. This module locks down that the predicate stays simulator-
|
|
global and that bundle filtering is applied post-parse instead.
|
|
"""
|
|
|
|
import os
|
|
|
|
import pytest
|
|
|
|
import hang_watcher
|
|
|
|
|
|
# === predicate composition ===
|
|
|
|
|
|
def test_default_predicate_includes_runningboard_clause():
|
|
predicate = hang_watcher._resolve_predicate(None)
|
|
assert 'com.apple.runningboard' in predicate
|
|
assert 'Hang detected' in predicate
|
|
|
|
|
|
def test_cli_override_takes_precedence():
|
|
predicate = hang_watcher._resolve_predicate('custom == 1')
|
|
assert predicate == 'custom == 1'
|
|
|
|
|
|
def test_env_var_takes_precedence_over_default(monkeypatch):
|
|
monkeypatch.setenv('IOS_SIM_HANG_PREDICATE', 'env == 1')
|
|
assert hang_watcher._resolve_predicate(None) == 'env == 1'
|
|
|
|
|
|
def test_predicate_never_narrows_for_bundle_id():
|
|
"""The fix: `_resolve_predicate` no longer accepts a bundle_id arg at all.
|
|
|
|
Confirming via signature inspection — adding the param back would resurrect
|
|
the bug.
|
|
"""
|
|
import inspect
|
|
|
|
params = inspect.signature(hang_watcher._resolve_predicate).parameters
|
|
assert list(params) == ['predicate'], (
|
|
f"_resolve_predicate must take only `predicate`, got {list(params)}. "
|
|
"Adding bundle_id back will re-narrow the predicate and drop RunningBoard events."
|
|
)
|
|
|
|
|
|
# === post-parse bundle filter ===
|
|
|
|
|
|
def test_matches_bundle_matches_app_suffix():
|
|
event = {'process': 'grapla', 'message': 'Hang detected'}
|
|
assert hang_watcher.matches_bundle(event, 'com.conorluddy.grapla') is True
|
|
|
|
|
|
def test_matches_bundle_is_case_insensitive():
|
|
event = {'process': 'Grapla', 'message': 'x'}
|
|
assert hang_watcher.matches_bundle(event, 'com.conorluddy.GRAPLA') is True
|
|
|
|
|
|
def test_matches_bundle_rejects_other_process():
|
|
event = {'process': 'runningboardd', 'message': 'x'}
|
|
assert hang_watcher.matches_bundle(event, 'com.conorluddy.grapla') is False
|
|
|
|
|
|
def test_matches_bundle_handles_missing_process():
|
|
event = {'message': 'x'}
|
|
assert hang_watcher.matches_bundle(event, 'com.example.app') is False
|