mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* refactor(plugins): remove the no-op PluginHealthMonitor Its monitor loop did nothing (`if callbacks: pass`), register_health_check had no callers and api_v3.health_monitor was never read by any route. The live health data comes from PluginHealthTracker, which is untouched. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(store): drop the never-set uninstall tombstones Nothing in production called mark_recently_uninstalled, so the reconciler's was_recently_uninstalled check was always False. The persistent uninstall registry is what actually stops resurrection; the reconciler test now exercises that gate instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(common): delete unused config/display/game helpers, utils and error_handler Nothing in core, the web UI, scripts or the plugin monorepo imports config_helper, display_helper, game_helper, utils or error_handler; only their own tests did. The error_handler re-exports leave src.common's __all__; APIHelper, TextHelper, ScrollHelper, LogoHelper and the adaptive layout exports are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop ConfigService's unused versioning and save API ConfigVersion, get_version/get_version_history/get_version_config, rollback, save_config, reload, get_plugin_config and the backward-compat load_config/get_config_path/get_secrets_path had no callers. The display controller only uses get_config, subscribe, unsubscribe and shutdown, plus the file watcher. Change detection now compares against the current checksum instead of the last history entry. The subscriber tests asserted `callback.called or True`; they now reload the way the watcher does and assert the notification. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): drop unread plugin state history and callbacks plugin_state.PluginStateManager kept a bounded per-plugin transition history that only get_state_history (tests only) read; get_state_info reports a separate lifetime count, which stays. set_error_info and record_display had no callers, and set_state_with_error's `error` argument only fed the history. The web-side state_manager.PluginStateManager loses subscribe_to_state_changes, _notify_callbacks, set_plugin_error and get_state_version, none of which had callers; with no subscribers the old-state copy in update_plugin_state went with them. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): remove unused PluginManager methods and attribute guards update_all_plugins was only called by a test (the display loop uses run_scheduled_updates); get_plugin_health_metrics, get_plugin_resource_metrics and get_plugin_state had no callers; and plugin_modules was written but never read. plugin_directories is now initialised in __init__, so the hasattr() guards around it go. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(plugins): remove unused executor, loader, store and package helpers - PluginExecutor.execute_safe: no callers. - PluginLoader._parse_semver: only its own tests; compatibility.parse_semver is the live copy and test_compatibility.py already covers it. - PluginStoreManager.get_installed_plugin_info: no callers. - PluginResourceMonitor._local: never read. - src.plugin_system.get_store_manager and __api_version__: no importers in core, scripts or the plugin monorepo. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): stop storing Wi-Fi passwords in wifi_config.json WiFiManager appended every joined network's SSID and password, in plaintext, to saved_networks in config/wifi_config.json, and nothing (web UI, backup restore, scripts) ever read them back: NetworkManager keeps its own credentials. The writes are gone, and loading the config now drops any saved_networks key and rewrites the file, so passwords already on disk are scrubbed. Also removes _check_dnsmasq_conflict (never called) and _detect_trixie, whose result only reached one log line, along with the NM_CONNECTIONS_PATHS constant only it used. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(display): remove unreachable and unused DisplayController code - _follower_rebuild_scroll_image: never called. - mode_duration (never read) and last_mode_change (write-only). - The `chosen_cap <= 0` branch: chosen_cap is either the minimum of caps already filtered to > 0 or DEFAULT_DYNAMIC_DURATION_CAP (180). - The `max_duration < min_duration` branch directly after `max_duration = max(min_duration, max_duration)`. - The circuit-breaker branch's `display_result = False` and `manager_to_display = None`: the first is overwritten a few lines later, the second is already None there. - The bool-to-bool conversion of execute_display's result, which is always a bool. - The `loaded_plugins` lookup in _update_modules: PluginManager has no such attribute, so it always fell through to `plugins`. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(vegas): remove unused config update, boundary finder and refresh VegasModeConfig.update had no callers outside its own tests (the coordinator rebuilds the config with from_config on a change); geometry.find_item_boundary and StreamManager._refresh_plugin_content had no callers at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(run): drop the debug block that pretended to import the plugin system In debug mode run.py put src/plugin_system itself on sys.path and printed "Plugin system import successful" without importing anything. Nothing imports plugin_system modules by bare name, so the path entry did nothing either. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: delete tests that test nothing - test/plugins/test_{basketball_scoreboard,calendar,clock_simple, odds_ticker,soccer_scoreboard,text_display}.py skip everywhere the named plugins are not installed, including CI (LEDMATRIX_PLUGINS_DIR holds only the fixture plugin); test_plugin_matrix.py already covers every discovered plugin. Their PluginTestBase and the fixtures only it used (plugins_dir, mock_display_manager, mock_cache_manager, mock_plugin_manager, base_plugin_config in test/plugins/conftest.py) go with them. - test_plugin_system.py: test_discover_plugins (body was `pass`) and test_dependency_check (a comment), plus the test_plugin_manager fixture only the former requested. - test_display_manager.py: test_draw_image asserted that an image it had just assigned was not None. - test_display_controller.py: the rotation and schedule-override tests re-implemented the run-loop arithmetic inline and asserted on their own result without calling the controller. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test: expect one plugin_last_update success stamp after update_all_plugins EveryStampRecordsACompletion required at least two success-path stamps; the second was update_all_plugins, removed as test-only. The worker and synchronous paths share the remaining stamp in _execute_update_now, and the check that every stamp calls _note_update_completed is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
363 lines
17 KiB
Python
363 lines
17 KiB
Python
import time
|
|
from datetime import datetime
|
|
from unittest.mock import MagicMock, patch
|
|
import pytest
|
|
|
|
class TestDisplayControllerInitialization:
|
|
"""Test DisplayController initialization and setup."""
|
|
|
|
def test_init_success(self, test_display_controller):
|
|
"""Test successful initialization."""
|
|
assert test_display_controller.config_service is not None
|
|
assert test_display_controller.display_manager is not None
|
|
assert test_display_controller.cache_manager is not None
|
|
assert test_display_controller.font_manager is not None
|
|
assert test_display_controller.plugin_manager is not None
|
|
assert test_display_controller.available_modes == []
|
|
|
|
|
|
class TestDisplayControllerOnDemand:
|
|
"""Test on-demand request handling."""
|
|
|
|
def test_activate_on_demand(self, test_display_controller):
|
|
"""Test activating on-demand mode."""
|
|
controller = test_display_controller
|
|
controller.available_modes = ["mode1", "mode2"]
|
|
controller.plugin_modes = {"mode1": MagicMock(), "mode2": MagicMock(), "od_mode": MagicMock()}
|
|
controller.mode_to_plugin_id = {"od_mode": "od_plugin"}
|
|
|
|
request = {
|
|
"action": "start",
|
|
"plugin_id": "od_plugin",
|
|
"mode": "od_mode",
|
|
"duration": 60
|
|
}
|
|
|
|
controller._activate_on_demand(request)
|
|
|
|
assert controller.on_demand_active is True
|
|
assert controller.on_demand_mode == "od_mode"
|
|
assert controller.on_demand_duration == 60.0
|
|
assert controller.on_demand_schedule_override is True
|
|
assert controller.force_change is True
|
|
|
|
def test_on_demand_expiration(self, test_display_controller):
|
|
"""Test on-demand mode expiration."""
|
|
controller = test_display_controller
|
|
controller.on_demand_active = True
|
|
controller.on_demand_mode = "od_mode"
|
|
controller.on_demand_expires_at = time.time() - 10 # Expired
|
|
|
|
controller._check_on_demand_expiration()
|
|
|
|
assert controller.on_demand_active is False
|
|
assert controller.on_demand_mode is None
|
|
assert controller.on_demand_last_event == "expired"
|
|
|
|
|
|
class TestDisplayControllerLivePriority:
|
|
"""Test live priority content switching."""
|
|
|
|
def test_live_priority_detection(self, test_display_controller, mock_plugin_with_live):
|
|
"""Test detection of live priority content."""
|
|
controller = test_display_controller
|
|
# Set up plugin modes with proper mode name matching
|
|
normal_plugin = MagicMock()
|
|
normal_plugin.has_live_priority = MagicMock(return_value=False)
|
|
normal_plugin.has_live_content = MagicMock(return_value=False)
|
|
|
|
# The mode name needs to match what get_live_modes returns or end with _live
|
|
controller.plugin_modes = {
|
|
"test_plugin_live": mock_plugin_with_live, # Match get_live_modes return value
|
|
"normal_mode": normal_plugin
|
|
}
|
|
controller.mode_to_plugin_id = {"test_plugin_live": "test_plugin", "normal_mode": "normal_plugin"}
|
|
|
|
live_mode = controller._check_live_priority()
|
|
|
|
# Should return the mode name that has live content
|
|
assert live_mode == "test_plugin_live"
|
|
|
|
def test_live_priority_switch(self, test_display_controller, mock_plugin_with_live):
|
|
"""Test switching to live priority mode."""
|
|
controller = test_display_controller
|
|
controller.available_modes = ["normal_mode", "test_plugin_live"]
|
|
controller.current_display_mode = "normal_mode"
|
|
|
|
# Set up normal plugin without live content
|
|
normal_plugin = MagicMock()
|
|
normal_plugin.has_live_priority = MagicMock(return_value=False)
|
|
normal_plugin.has_live_content = MagicMock(return_value=False)
|
|
|
|
# Use mode name that matches get_live_modes return value
|
|
controller.plugin_modes = {
|
|
"test_plugin_live": mock_plugin_with_live,
|
|
"normal_mode": normal_plugin
|
|
}
|
|
controller.mode_to_plugin_id = {"test_plugin_live": "test_plugin", "normal_mode": "normal_plugin"}
|
|
|
|
# Simulate check loop logic
|
|
live_priority_mode = controller._check_live_priority()
|
|
if live_priority_mode and controller.current_display_mode != live_priority_mode:
|
|
controller.current_display_mode = live_priority_mode
|
|
controller.force_change = True
|
|
|
|
# Should switch to live mode if detected
|
|
assert controller.current_display_mode == "test_plugin_live"
|
|
assert controller.force_change is True
|
|
|
|
def test_live_priority_resume_continues_rotation(self, test_display_controller):
|
|
"""Regression: when live priority ends, rotation resumes where it was
|
|
interrupted, not after the live plugin's mode.
|
|
|
|
Without the fix, _apply_live_priority left current_mode_index pointing at
|
|
the live plugin's slot, so the next rotation step skipped every mode
|
|
between the interrupted position and the live plugin (e.g. elections,
|
|
which sits just before a flights plugin in the order)."""
|
|
controller = test_display_controller
|
|
controller.available_modes = [
|
|
"weather", "forecast", "almanac", "election_ticker", "flight_live"
|
|
]
|
|
# Rotation is about to show the 3rd mode (index 2).
|
|
controller.current_mode_index = 2
|
|
controller.current_display_mode = "almanac"
|
|
controller._live_resume_index = None
|
|
|
|
# Live priority (e.g. planes overhead) preempts -> flight_live (index 4).
|
|
controller._apply_live_priority("flight_live")
|
|
assert controller.current_display_mode == "flight_live"
|
|
assert controller.current_mode_index == 4
|
|
assert controller._live_resume_index == 2 # saved rotation position
|
|
|
|
# Re-checks while the hold continues must not move the saved position.
|
|
controller._apply_live_priority("flight_live")
|
|
assert controller._live_resume_index == 2
|
|
|
|
# Live priority ends -> resume at the saved index (almanac), so the next
|
|
# rotation step lands on election_ticker (index 3) rather than skipping it.
|
|
controller._apply_live_priority(None)
|
|
assert controller.current_mode_index == 2
|
|
assert controller.current_display_mode == "almanac"
|
|
assert controller._live_resume_index is None
|
|
|
|
def test_live_priority_no_resume_when_idle(self, test_display_controller):
|
|
"""No saved position + no live content is a no-op (normal rotation)."""
|
|
controller = test_display_controller
|
|
controller.available_modes = ["a", "b", "c"]
|
|
controller.current_mode_index = 1
|
|
controller.current_display_mode = "b"
|
|
controller._live_resume_index = None
|
|
|
|
controller._apply_live_priority(None)
|
|
|
|
assert controller.current_mode_index == 1
|
|
assert controller.current_display_mode == "b"
|
|
|
|
# --- Round-robin between multiple simultaneous live games --------------
|
|
|
|
@staticmethod
|
|
def _live_plugin(live_modes):
|
|
"""A mock plugin that is live and reports the given live mode names."""
|
|
p = MagicMock()
|
|
p.has_live_priority = MagicMock(return_value=True)
|
|
p.has_live_content = MagicMock(return_value=True)
|
|
p.get_live_modes = MagicMock(return_value=list(live_modes))
|
|
return p
|
|
|
|
def test_collect_live_modes_dedupes_multi_mode_plugin(self, test_display_controller):
|
|
"""A sports plugin registered under several mode keys (one per league)
|
|
contributes each live mode once, in registration order; plugins with no
|
|
live content are skipped."""
|
|
controller = test_display_controller
|
|
baseball = self._live_plugin(["baseball_live"])
|
|
soccer = self._live_plugin(["soccer_fifa.world_live"])
|
|
idle = MagicMock()
|
|
idle.has_live_priority = MagicMock(return_value=True)
|
|
idle.has_live_content = MagicMock(return_value=False)
|
|
controller.plugin_modes = {
|
|
"baseball_live": baseball,
|
|
"baseball_recent": baseball,
|
|
"soccer_fifa.world_live": soccer,
|
|
"soccer_usa.1_live": soccer,
|
|
"soccer_recent": soccer,
|
|
"clock": idle,
|
|
}
|
|
assert controller._collect_live_modes() == [
|
|
"baseball_live", "soccer_fifa.world_live"
|
|
]
|
|
|
|
def test_round_robin_alternates_between_simultaneous_live_games(self, test_display_controller):
|
|
"""Regression: with two games live at once, the live-priority pick
|
|
round-robins each dwell instead of pinning to the first plugin in
|
|
registration order (the bug where a baseball game hid a live World Cup
|
|
match)."""
|
|
controller = test_display_controller
|
|
baseball = self._live_plugin(["baseball_live"])
|
|
soccer = self._live_plugin(["soccer_fifa.world_live"])
|
|
controller.plugin_modes = {
|
|
"baseball_live": baseball,
|
|
"soccer_fifa.world_live": soccer,
|
|
}
|
|
# First entry into live priority from an ambient mode -> first live game.
|
|
controller.current_display_mode = "clock"
|
|
assert controller._check_live_priority(advance=True) == "baseball_live"
|
|
# The controller switches to it; the next dwell advances to the other.
|
|
controller.current_display_mode = "baseball_live"
|
|
assert controller._check_live_priority(advance=True) == "soccer_fifa.world_live"
|
|
# And wraps back again.
|
|
controller.current_display_mode = "soccer_fifa.world_live"
|
|
assert controller._check_live_priority(advance=True) == "baseball_live"
|
|
|
|
def test_single_live_game_holds_without_flipping(self, test_display_controller):
|
|
"""One live game: advancing returns the same mode, so the hold is stable."""
|
|
controller = test_display_controller
|
|
controller.plugin_modes = {"baseball_live": self._live_plugin(["baseball_live"])}
|
|
controller.current_display_mode = "baseball_live"
|
|
assert controller._check_live_priority(advance=True) == "baseball_live"
|
|
|
|
def test_non_advancing_peek_does_not_rotate(self, test_display_controller):
|
|
"""The default (advance=False) peek used by the Vegas coordinator must
|
|
not spin the cursor: it returns the live mode already on screen."""
|
|
controller = test_display_controller
|
|
controller.plugin_modes = {
|
|
"baseball_live": self._live_plugin(["baseball_live"]),
|
|
"soccer_fifa.world_live": self._live_plugin(["soccer_fifa.world_live"]),
|
|
}
|
|
controller.current_display_mode = "soccer_fifa.world_live"
|
|
assert controller._check_live_priority() == "soccer_fifa.world_live"
|
|
assert controller._check_live_priority() == "soccer_fifa.world_live"
|
|
# From an ambient mode the peek reports the first live game (truthy).
|
|
controller.current_display_mode = "clock"
|
|
assert controller._check_live_priority() == "baseball_live"
|
|
|
|
def test_no_live_content_returns_none(self, test_display_controller):
|
|
controller = test_display_controller
|
|
idle = MagicMock()
|
|
idle.has_live_priority = MagicMock(return_value=True)
|
|
idle.has_live_content = MagicMock(return_value=False)
|
|
controller.plugin_modes = {"clock": idle}
|
|
controller.current_display_mode = "clock"
|
|
assert controller._check_live_priority(advance=True) is None
|
|
|
|
def test_fallback_to_mode_name_when_get_live_modes_unhelpful(self, test_display_controller):
|
|
"""A live plugin whose get_live_modes returns nothing registered falls
|
|
back to its own '_live' mode name (legacy behavior preserved)."""
|
|
controller = test_display_controller
|
|
legacy = MagicMock()
|
|
legacy.has_live_priority = MagicMock(return_value=True)
|
|
legacy.has_live_content = MagicMock(return_value=True)
|
|
legacy.get_live_modes = MagicMock(return_value=["unregistered_mode"])
|
|
controller.plugin_modes = {"hockey_live": legacy}
|
|
controller.current_display_mode = "clock"
|
|
assert controller._check_live_priority(advance=True) == "hockey_live"
|
|
|
|
|
|
class TestDisplayControllerDynamicDuration:
|
|
"""Test dynamic duration handling."""
|
|
|
|
def test_plugin_supports_dynamic(self, test_display_controller, mock_plugin_with_dynamic):
|
|
"""Test checking if plugin supports dynamic duration."""
|
|
controller = test_display_controller
|
|
assert controller._plugin_supports_dynamic(mock_plugin_with_dynamic) is True
|
|
|
|
mock_normal = MagicMock()
|
|
mock_normal.supports_dynamic_duration.side_effect = AttributeError
|
|
assert controller._plugin_supports_dynamic(mock_normal) is False
|
|
|
|
def test_get_dynamic_cap(self, test_display_controller, mock_plugin_with_dynamic):
|
|
"""Test retrieving dynamic duration cap."""
|
|
controller = test_display_controller
|
|
cap = controller._plugin_dynamic_cap(mock_plugin_with_dynamic)
|
|
assert cap == 180.0
|
|
|
|
def test_global_cap_fallback(self, test_display_controller):
|
|
"""Test global dynamic duration cap."""
|
|
controller = test_display_controller
|
|
controller.global_dynamic_config = {"max_duration_seconds": 120}
|
|
assert controller._get_global_dynamic_cap() == 120.0
|
|
|
|
controller.global_dynamic_config = {}
|
|
assert controller._get_global_dynamic_cap() == 180.0 # Default
|
|
|
|
|
|
class TestDisplayControllerSchedule:
|
|
"""Test schedule management."""
|
|
|
|
def test_schedule_disabled(self, test_display_controller):
|
|
"""schedule.enabled=False keeps the display active even outside the
|
|
configured window. (This test used to patch config_service, which
|
|
_check_schedule never reads — it asserted the init default.)"""
|
|
controller = test_display_controller
|
|
controller.config['schedule'] = {
|
|
"enabled": False,
|
|
"start_time": "09:00",
|
|
"end_time": "17:00",
|
|
}
|
|
controller._schedule_checked_minute = None
|
|
controller._tz = None
|
|
controller.is_display_active = False # prove the method flips it back
|
|
|
|
with patch('src.display_controller.datetime') as mock_datetime:
|
|
mock_datetime.now.return_value.strftime.return_value.lower.return_value = "monday"
|
|
mock_datetime.now.return_value.time.return_value = datetime.strptime("20:00", "%H:%M").time()
|
|
mock_datetime.strptime = datetime.strptime
|
|
|
|
controller._check_schedule()
|
|
assert controller.is_display_active is True
|
|
|
|
def test_active_hours(self, test_display_controller):
|
|
"""A time inside the window activates the display. (This test used
|
|
to patch config_service, which _check_schedule never reads — it
|
|
asserted the init default.)"""
|
|
controller = test_display_controller
|
|
controller.config['schedule'] = {
|
|
"enabled": True,
|
|
"start_time": "09:00",
|
|
"end_time": "17:00",
|
|
}
|
|
controller._schedule_checked_minute = None
|
|
controller._tz = None
|
|
controller.is_display_active = False # prove the method flips it on
|
|
|
|
with patch('src.display_controller.datetime') as mock_datetime:
|
|
mock_datetime.now.return_value.strftime.return_value.lower.return_value = "monday"
|
|
mock_datetime.now.return_value.time.return_value = datetime.strptime("12:00", "%H:%M").time()
|
|
mock_datetime.strptime = datetime.strptime
|
|
|
|
controller._check_schedule()
|
|
assert controller.is_display_active is True
|
|
|
|
def test_inactive_hours(self, test_display_controller):
|
|
"""Test inactive hours check."""
|
|
controller = test_display_controller
|
|
# Inject schedule directly into self.config (what _check_schedule actually reads)
|
|
# and reset the minute gate so the cached result from any prior call is cleared.
|
|
controller.config['schedule'] = {
|
|
"enabled": True,
|
|
"start_time": "09:00",
|
|
"end_time": "17:00",
|
|
}
|
|
controller._schedule_checked_minute = None
|
|
controller._tz = None
|
|
|
|
with patch('src.display_controller.datetime') as mock_datetime:
|
|
mock_datetime.now.return_value.strftime.return_value.lower.return_value = "monday"
|
|
mock_datetime.now.return_value.time.return_value = datetime.strptime("20:00", "%H:%M").time()
|
|
mock_datetime.strptime = datetime.strptime
|
|
|
|
controller._check_schedule()
|
|
assert controller.is_display_active is False
|
|
|
|
|
|
class TestPluginHealthWiring:
|
|
"""Phase 1: DisplayController activates the dormant plugin health/metrics
|
|
subsystem by wiring real tracker/monitor instances onto the plugin manager."""
|
|
|
|
def test_health_tracker_and_resource_monitor_wired(self, test_display_controller):
|
|
from src.plugin_system.plugin_health import PluginHealthTracker
|
|
from src.plugin_system.resource_monitor import PluginResourceMonitor
|
|
|
|
pm = test_display_controller.plugin_manager
|
|
assert isinstance(pm.health_tracker, PluginHealthTracker)
|
|
assert isinstance(pm.resource_monitor, PluginResourceMonitor)
|