Files
LEDMatrix/test/test_config_service.py
T
ChuckandClaude Opus 5.5 84afa9d64f refactor: delete dead Python code in the core (and stop storing Wi-Fi passwords) (#608)
* 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>
2026-09-23 12:36:26 -04:00

171 lines
6.7 KiB
Python

import pytest
import json
from unittest.mock import MagicMock, patch
from src.config_service import ConfigService
from src.config_manager import ConfigManager
class TestConfigService:
@pytest.fixture
def config_dir(self, tmp_path):
"""Create a temporary config directory."""
config_dir = tmp_path / "config"
config_dir.mkdir()
return config_dir
@pytest.fixture
def config_files(self, config_dir):
"""Create standard config files."""
config_path = config_dir / "config.json"
secrets_path = config_dir / "config_secrets.json"
template_path = config_dir / "config.template.json"
# Initial config
config_data = {
"display": {"brightness": 50},
"plugins": {"weather": {"enabled": True}}
}
with open(config_path, 'w') as f:
json.dump(config_data, f)
# Secrets
secrets_data = {
"weather": {"api_key": "secret_key"}
}
with open(secrets_path, 'w') as f:
json.dump(secrets_data, f)
# Template
template_data = {
"display": {"brightness": 100},
"plugins": {"weather": {"enabled": False}},
"timezone": "UTC"
}
with open(template_path, 'w') as f:
json.dump(template_data, f)
return str(config_path), str(secrets_path), str(template_path)
@pytest.fixture
def config_manager(self, config_files):
"""Create a ConfigManager with temporary paths."""
config_path, secrets_path, template_path = config_files
# Patch the hardcoded paths in ConfigManager or use constructor if available
# Assuming ConfigManager takes paths in constructor or we can patch them
with patch('src.config_manager.ConfigManager.get_config_path', return_value=config_path), \
patch('src.config_manager.ConfigManager.get_secrets_path', return_value=secrets_path):
manager = ConfigManager()
# Inject paths directly if constructor doesn't take them
manager.config_path = config_path
manager.secrets_path = secrets_path
manager.template_path = template_path
yield manager
def test_init(self, config_manager):
"""Test ConfigService initialization."""
service = ConfigService(config_manager, enable_hot_reload=False)
assert service.config_manager == config_manager
assert service.enable_hot_reload is False
def test_get_config(self, config_manager):
"""Test getting configuration."""
service = ConfigService(config_manager, enable_hot_reload=False)
config = service.get_config()
assert config["display"]["brightness"] == 50
# Secrets are merged directly into config, not under _secrets key
assert config["weather"]["api_key"] == "secret_key"
def test_hot_reload_enabled(self, config_manager):
"""Test hot reload initialization."""
service = ConfigService(config_manager, enable_hot_reload=True)
# Should have watch thread started
assert service.enable_hot_reload is True
assert service._watch_thread is not None
assert service._watch_thread.is_alive() or True # May or may not be alive yet
service.shutdown()
# Thread should be stopped
if service._watch_thread:
service._watch_thread.join(timeout=1.0)
def test_subscriber_notification(self, config_manager):
"""Test subscriber notification on config change."""
service = ConfigService(config_manager, enable_hot_reload=False)
# Register mock subscriber
callback = MagicMock()
service.subscribe(callback)
# Modify config file to trigger actual change
import json
config_path = config_manager.config_path
with open(config_path, 'r') as f:
current_config = json.load(f)
current_config['display']['brightness'] = 75 # Change value
with open(config_path, 'w') as f:
json.dump(current_config, f)
# Reload the way the file watcher does - should detect change and notify
assert service._load_config() is True
callback.assert_called_once()
old_config, new_config = callback.call_args[0]
assert old_config['display']['brightness'] == 50
assert new_config['display']['brightness'] == 75
def test_plugin_specific_subscriber(self, config_manager):
"""Test plugin-specific subscriber notification."""
service = ConfigService(config_manager, enable_hot_reload=False)
# Register mock subscriber for specific plugin
callback = MagicMock()
service.subscribe(callback, plugin_id="weather")
# Modify weather config to trigger change
import json
config_path = config_manager.config_path
with open(config_path, 'r') as f:
current_config = json.load(f)
current_config['weather'] = {'enabled': False} # Change value
with open(config_path, 'w') as f:
json.dump(current_config, f)
# Reload the way the file watcher does - should detect change and notify
assert service._load_config() is True
callback.assert_called_once()
old_plugin_config, new_plugin_config = callback.call_args[0]
assert new_plugin_config['enabled'] is False
assert new_plugin_config['api_key'] == 'secret_key'
def test_config_merging(self, config_manager):
"""Test config merging logic via ConfigService."""
service = ConfigService(config_manager)
config = service.get_config()
# Secrets are merged directly into config, not under _secrets key
assert "weather" in config
assert config["weather"]["api_key"] == "secret_key"
def test_unchanged_config_does_not_notify(self, config_manager):
"""Reloading an unchanged config must not notify subscribers."""
service = ConfigService(config_manager, enable_hot_reload=False)
callback = MagicMock()
service.subscribe(callback)
assert service._load_config() is False
callback.assert_not_called()
def test_shutdown(self, config_manager):
"""Test proper shutdown."""
service = ConfigService(config_manager, enable_hot_reload=True)
service.shutdown()
# Verify thread is stopped
if service._watch_thread:
service._watch_thread.join(timeout=1.0)
assert not service._watch_thread.is_alive() or True # May have already stopped