mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 06:15:09 +00:00
* fix(errors): record the exception's own stack trace record_error() called traceback.format_exc(), which only sees an exception while its except block is running. plugin_executor records exceptions caught on a worker thread after that block has ended, so every trace on /errors read "NoneType: None". The trace is now built from the exception's __traceback__. The executor's log call had the same problem with exc_info=True and now passes the exception. record_error() also merged LEDMatrixError context into the caller's dict in place; it now works on a copy. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(wifi): point at configure_wifi_permissions.sh instead of a sudoers list The module docstring told users to grant NOPASSWD sudo on iptables and ip. configure_wifi_permissions.sh refuses those grants on purpose: a wildcard rule for either runs an arbitrary program as root. Point at the script and say why it leaves them out. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): disconnect finds the saved profile by SSID disconnect_from_network() asked `nmcli -f NAME,802-11-wireless.ssid connection show` for the profile to take down, but nmcli rejects that column for `connection show`, so the lookup always failed and only the device was disconnected. The per-profile lookup _connect_nmcli() already used is now _find_profile_for_ssid(), and both callers share it. It also splits terse output on the last colon and unescapes "\:", so a profile name containing a colon is found. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(wifi): write wifi_config.json atomically and report a failed save _save_config() opened the file for writing in place and swallowed any error, so a wifi_config.json left owned by root made the web toggle for auto-enabling AP mode report success while nothing was saved, and a crash mid-write could truncate the file. It now uses atomic_write_json, which also keeps the file's owner and shared group when root saves it, and returns False on failure. POST /wifi/ap/auto-enable answers 500 in that case. The file is now written with indent=4, like the other config files. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve plugin:// fonts in the plugin's own directory FontManager looked for a plugin's bundled fonts under Path("plugins") / plugin_id: relative to the process cwd, and not the default install directory (plugin-repos/), so a manifest's plugin:// fonts never loaded. register_plugin_fonts() takes an optional plugin_dir, and PluginManager passes the directory it loaded the plugin from. Callers that omit it get a lookup in the configured plugin_system.plugins_directory, then plugins/, resolved against the install root. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(api-helper): cache responses for the requested cache_ttl APIHelper.get(cache_ttl=...) and set_cache(ttl=...) dropped the ttl on the claim that CacheManager does not support one, but CacheManager.set() takes a ttl, stores it with the entry, and both cache tiers honour it over a reader's max_age. Without it every response expired after the 300-second default read age, whatever the plugin asked for. The ttl is now passed through, and the cache read passes cache_ttl as max_age for entries written without one. The class docstring describes what the helper actually does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(style): one scale range for the schema, element_scale and LogoHelper The generated Scale field allowed 0.1 to 10, element_style's reader capped at 10 with no floor, and LogoHelper accepted 0.05 to 8 and reset anything else to 1.0. A logo scale of 9, which the form accepts, drew at the shipped size. MIN_ELEMENT_SCALE / MAX_ELEMENT_SCALE (0.1, 10.0) in src.element_style are now the schema bounds and the clamp every reader applies through coerce_scale(): a positive number outside the range is clamped, and anything that is not a finite positive number means the default. That also stops element_scale() passing NaN through, since min(nan, 10.0) is nan. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(logos): placeholder lands at the requested path; empty logos list download_missing_logo() wrote its fallback placeholder to <normalize_abbreviation(abbr)>.png in the logo directory rather than to the logo_path the caller passed, so it could return True while nothing existed where the plugin looks (e.g. "TA&M.png" vs "TAANDM.png"). create_placeholder_logo() takes an optional filepath, and download_missing_logo passes the requested one. download_missing_logo_for_team() only caught KeyError, so a team whose "logos" list is empty raised IndexError; it now treats KeyError, IndexError and TypeError as "no logo URL". The placeholder is drawn with PLACEHOLDER_SIZE / PLACEHOLDER_BG, the constants is_placeholder_logo() recognises it by, instead of repeated literals. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(fonts): resolve bundled font paths against the install root TextHelper's default font_dir, the logo placeholder's font and FontManager's font_overrides.json were all relative to the process cwd, so a process started anywhere but the install root (the plugin safety harness, a manual run, a unit without WorkingDirectory) drew with PIL's default face and read no overrides. They now go through font_layout.resolve_asset_path; the overrides file sits in the install root's config/. The resolver docstrings described an order the code does not follow: resolve_asset_path never consults the cwd, and sports_shared's _resolve_font_path tries the cwd first. Both docstrings now say what the code does, and _resolve_font_path calls resolve_asset_path instead of probing FontManager for it. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(sync): the web UI reads the sync status file the display writes sync_manager writes its status to tempfile.gettempdir(), but GET /api/v3/sync/status read a hardcoded /tmp/led_matrix_sync_status.json and defaulted the port to a literal 5765. Wherever TMPDIR is set (or on any non-/tmp host) the page only ever showed "starting". The endpoint now uses sync_manager.STATUS_FILE and SYNC_PORT. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(http): the rankings resolver sends the project's User-Agent DynamicTeamResolver fetched ESPN rankings with a bare requests.get, so it sent python-requests' default User-Agent, which ESPN rejects; the AP_TOP_N favourites then resolved to nothing. It now sends DEFAULT_HTTP_HEADERS. BaseOddsManager carried its own copy of the User-Agent string and now uses the same shared headers (which also adds Accept-Language). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(backup): record the core release and read the configured plugin dir The manifest's ledmatrix_version came from a VERSION file that does not exist, then from .git/HEAD: a 12-character sha, or "ref: refs/he" when the branch's ref was packed. It is now src.__version__. list_installed_plugins() scanned a hardcoded plugin-repos/, so on an install whose plugin_system.plugins_directory points elsewhere, plugins missing from plugin_state.json were left out of the backup. It now reads the configured directory from config/config.json, defaulting to plugin-repos. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(startup): report a missing display section once A config without a display section produced three errors for the one problem ("Missing required configuration key: display", "Display configuration is missing or empty" and "Display configuration is missing"), and an empty one produced two. _validate_config now reports it once, as a missing key or an empty section, and _validate_display_config leaves it to that. The module docstring said the validator fails fast; nothing in the display service calls raise_on_errors(), so it now says the errors are reported and startup continues. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(wifi): share the copied blocks and name the AP constants - _parse_nmcli_wifi_list() is the one parser behind _scan_nmcli and _scan_nmcli_cached. - _verify_connected(), _wait_for_device_idle(), _failsafe_ap() and _mark_forced() replace blocks that were pasted two or three times in the connect and enable-AP paths. The device-idle wait now checks before its first one-second sleep instead of after it. - _check_command() calls _find_command_path() instead of repeating it. - AP_IP, PORTAL_PORT, AP_PROFILE_NAME and AP_PROFILE_NAMES name values that were spelled out 14, 12, 8 and 2 times; the two deletion loops now walk the same tuple. The iwconfig status path compares the AP address exactly: startswith() also skipped 192.168.4.10-19. - Dropped a second WIFI.SIGNAL query that repeated the first, a no-op "if ssid: continue", the try/except around _connect_wpa_supplicant's constant return, and a second save of a scan scan_networks already saves. - _ensure_wifi_radio_enabled's docstring says it returns True when the radio state cannot be read at all. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(config): drop dead branches and history comments in ConfigManager - The module docstring pointed plugin authors at update_plugin_config(), which does not exist; it now names save_config_atomic() and save_raw_file_content(). - load_config's FileNotFoundError handler tested the message for "config_secrets.json", but a missing secrets file is handled where it is read, so only config.json reaches it; the check is gone. - save_raw_file_content's `file_type == "main" or "secrets"` guard was always true (anything else raised earlier). - get_raw_file_content('secrets') already returns {} for a missing file, so the os.path.exists() in front of two calls to it is gone. - Comments that narrated earlier behaviour are rewritten as what the code does now. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(background-data): present-tense comments, drop unused API - Comments that told the history of each fix (what "used to" happen, "the old per-delivery release") now state the invariant the code keeps. - get_statistics() no longer reports a constant 'queue_size': 0, and the uncalled clear_completed_requests() is gone (_cleanup_completed_requests does that job on every completion). Neither is referenced in core, the web UI or the plugin monorepo. shutdown_background_service() has no production caller either, but it is the only way to tear down the get_background_service() singleton, which the tests rely on, so it stays. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(odds): drop the unread cache_ttl and merge the odds_data branches BaseOddsManager loaded base_odds_manager.cache_ttl from config and never used it: cached odds live for the update interval (get_odds' ttl=interval). No core or monorepo code reads the attribute, so it is gone along with its log line. The two consecutive `if odds_data:` blocks are one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(backup): one table for the single-file sections config, secrets, wifi and ytm_auth were each spelled out in create, preview, validate and restore. _SINGLE_FILE_SECTIONS lists them once, with the RestoreOptions flag that restores each, and all four walk it. Restore error messages keep their wording ("Failed to restore <file name>"). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(fonts): drop FontManager's write-only state and duplicate logs - fonts_config, font_metadata and font_dependencies were written and never read; the performance_stats keys font_load_times, render_times, total_renders and the per-call "resolve" timings (_record_performance_metric) likewise. get_performance_stats() reads only the counters that remain. Nothing in core or the plugin monorepo references any of them. - A failed BDF load was logged twice, by _load_bdf_font and again by get_font; get_font's line is the one kept. - Removed "NEW:" and commented-out cozette entries, the "Copy font to assets/fonts" comment on code that copies nothing, and local imports of names the module already imports. The deprecated add_font() now resolves assets/fonts against the install root. The @deprecated methods stay. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(text-helper): cache loaded fonts; drop the pre-textlength fallback TextHelper declared _font_cache, cleared it and reported its size, but never stored anything in it. load_fonts() now keeps each (file, size) it loads there, so clear_font_cache() and get_font_cache_stats() mean what they say and repeated load_fonts() calls reuse the fonts. get_text_width() no longer catches AttributeError for Pillow releases without ImageDraw.textlength; requirements.txt pins Pillow>=12.2. The class docstring describes what the helper does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(common): fix wrong docstrings in api_helper, permission_utils, snapshot_policy - permission_utils called 0o2775 "sticky bit"; the 2 is setgid, which is what makes new files take the directory's group. - snapshot_policy pointed at web_interface/blueprints/api_v3.py, which is a package now; the health check is in api_v3/misc.py. - APIHelper.clear_cache() lost a history note and a fallback to a clear() method that neither CacheManager nor the testing MockCacheManager has. The session headers are built from DEFAULT_HTTP_HEADERS instead of a copy of them, and the module docstring says what the module offers. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(sports): present-tense comments in the shared scoreboard renderers - sports_scroll and sports_game_renderer comments that referred to "this PR", "the old flat 128px card" or what the renderer "previously" did now describe the current behaviour and its reason. - The block explaining why non-finite settings are rejected sat above _score_reserve_width; it describes _center_gap_width and now lives in it. - unshare_element_fonts wrapped its import of font_layout.load_truetype in an `except ImportError` that cannot fire inside core; the import stays at call time so tests can spy on the pinned loader. - sports_card docstrings that told the history of a fix say what the code does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sports-shared): drop dead code, name the ESPN limit - _get_weeks_data asked for limit=1000, which fetch_espn_scoreboard clamps to ESPN_MAX_LIMIT anyway; it now names that constant. Its unused `immediate_events = []` is gone. - _get_season_schedule_dates() returned ("", "") and has no caller in core or the plugin monorepo. - _should_log keeps its warning_type parameter (part of the inherited signature, though nothing in core or the monorepo calls it) and its docstring says the cooldown is shared across types. - An unused ImageFont import is gone. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(sync): one follower-mode switch, shared panel defaults - The class docstring said the leader sends PNG frames. Frames go over UDP as raw RGB; PNG is only the Vegas scroll image sent over TCP. It now describes both paths. - _enter_follower_mode() replaces the two copies of "note the leader, switch from standalone to follower, log, write status" in the frame and scroll-position handlers. - The rows/cols fallbacks use DEFAULT_ROWS / DEFAULT_COLS from src.display_geometry, as chain_length already did. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(style): drop _layout_axis, name the layout group title - ElementStyleResolver._layout_axis() had no caller in core or the plugin monorepo. - _element_block_from_spec checked spec['size'] was a dict again after size_spec already had; it reads size_spec. - The "Layout Offsets" title written into three generated schema blocks is _LAYOUT_TITLE. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(logo-helper): say what the placeholder draws; name the 1.5 box factor - _create_placeholder_logo's docstring said it draws the team abbreviation; it draws an outlined grey box and nothing else. The docstring says so, and the "in a real implementation you'd want text" comments are gone. - The 1.5 x panel default logo box, written out six times, is DEFAULT_LOGO_BOX_FACTOR. - ImageDraw is imported with Image at the top of the module. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(logos): drop dead code and a duplicate regex in logo_downloader - _SAFE_LEAGUE_CODE_RE was the same pattern as _SAFE_LEAGUE_RE; both checks use the one. - get_logo_filename_variations reassigned the TA&M case to the list it already had; the function returns the two names directly. - _get_team_name_variations() had no caller in core or the plugin monorepo. - fetch_single_team's docstring was copied from fetch_teams_data; a log message read "for{team_id}". Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor: drop the Pillow<9.1 resample shim and a catch-and-reraise - adaptive_images fell back to Image.LANCZOS/NEAREST for Pillow < 9.1; requirements.txt pins Pillow>=12.2. RESAMPLE_LANCZOS and RESAMPLE_NEAREST keep their names (src.common re-exports them). - CacheManager.save_cache caught CacheError only to re-raise it; the disk write is now called directly, with the same result. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(api-helper): stop the real CacheManager's cleanup thread The cache-lifetime tests built a CacheManager and left its cleanup thread's class-wide claim on the directory in place, which broke test_cache_cleanup_thread_ownership when it ran later in the session. The fixture now stops the thread on teardown. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(changelog): core-common Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
303 lines
13 KiB
Python
303 lines
13 KiB
Python
"""
|
|
Tests for src/startup_validator.py — pins the StartupValidator contract.
|
|
|
|
Covers: required-key/config error reporting (errors never propagate out of
|
|
validate_all), the load_config/get_config accessor split, cache-directory
|
|
error-vs-warning downgrade behavior, plugin discovery/manifest checks with
|
|
reserved config keys skipped, idempotent validate_all (fresh error/warning
|
|
lists each run — the pre-fix behavior duplicated messages), and the
|
|
exception classification precedence in raise_on_errors (config > cache >
|
|
plugin > fallback ConfigError).
|
|
"""
|
|
|
|
import copy
|
|
import os
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
|
|
from src.exceptions import CacheError, ConfigError, PluginError
|
|
from src.startup_validator import StartupValidator
|
|
|
|
GOOD_CONFIG = {
|
|
'display': {'hardware': {'rows': 32, 'cols': 64}},
|
|
'timezone': 'UTC',
|
|
}
|
|
|
|
|
|
def make_config_manager(config):
|
|
"""Config manager whose load_config() and get_config() return `config`."""
|
|
mgr = MagicMock()
|
|
mgr.load_config.return_value = copy.deepcopy(config)
|
|
mgr.get_config.return_value = copy.deepcopy(config)
|
|
return mgr
|
|
|
|
|
|
@pytest.fixture
|
|
def good_cache(monkeypatch, tmp_path):
|
|
"""Patch CacheManager so cache validation sees an existing writable dir.
|
|
|
|
_validate_cache_directory does `from src.cache_manager import CacheManager`
|
|
at call time, so patching the attribute on the module is picked up.
|
|
"""
|
|
mock_cls = MagicMock()
|
|
mock_cls.return_value.get_cache_dir.return_value = str(tmp_path)
|
|
monkeypatch.setattr("src.cache_manager.CacheManager", mock_cls)
|
|
return tmp_path
|
|
|
|
|
|
class TestValidateConfig:
|
|
"""Configuration validation via load_config()."""
|
|
|
|
def test_happy_path(self, good_cache):
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
assert warnings == []
|
|
|
|
def test_missing_required_keys(self, good_cache):
|
|
validator = StartupValidator(make_config_manager({}))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
assert "Missing required configuration key: display" in errors
|
|
assert "Missing required configuration key: timezone" in errors
|
|
|
|
@pytest.mark.parametrize("config,expected", [
|
|
({'timezone': 'UTC'}, "Missing required configuration key: display"),
|
|
({'display': {}, 'timezone': 'UTC'}, "Display configuration is empty"),
|
|
])
|
|
def test_a_missing_display_section_is_reported_once(self, good_cache, config, expected):
|
|
validator = StartupValidator(make_config_manager(config))
|
|
_, errors, _ = validator.validate_all()
|
|
assert errors == [expected]
|
|
|
|
def test_config_error_does_not_propagate(self, good_cache):
|
|
mgr = make_config_manager(GOOD_CONFIG)
|
|
mgr.load_config.side_effect = ConfigError("bad json")
|
|
validator = StartupValidator(mgr)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
config_errors = [e for e in errors if e.startswith("Configuration error:")]
|
|
assert len(config_errors) == 1
|
|
assert "bad json" in config_errors[0]
|
|
|
|
def test_unexpected_error_does_not_propagate(self, good_cache):
|
|
mgr = make_config_manager(GOOD_CONFIG)
|
|
mgr.load_config.side_effect = RuntimeError("kapow")
|
|
validator = StartupValidator(mgr)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
unexpected = [e for e in errors
|
|
if e.startswith("Unexpected error validating configuration:")]
|
|
assert len(unexpected) == 1
|
|
assert "kapow" in unexpected[0]
|
|
|
|
def test_accessor_split_get_config_failure_is_warning_only(self, good_cache):
|
|
# _validate_config uses load_config(); _validate_display_config uses
|
|
# get_config(). A broken get_config must degrade to a warning, not
|
|
# crash or produce a config error.
|
|
mgr = make_config_manager(GOOD_CONFIG)
|
|
mgr.get_config.side_effect = RuntimeError("accessor broken")
|
|
validator = StartupValidator(mgr)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
assert any(w.startswith("Could not validate display configuration:")
|
|
for w in warnings)
|
|
assert mgr.load_config.called
|
|
assert mgr.get_config.called
|
|
|
|
|
|
class TestDisplayConfig:
|
|
"""Display hardware validation via get_config()."""
|
|
|
|
def test_missing_hardware_section_is_error(self, good_cache):
|
|
config = {'display': {'runtime': {'gpio_slowdown': 2}}, 'timezone': 'UTC'}
|
|
validator = StartupValidator(make_config_manager(config))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
assert "Display hardware configuration is missing" in errors
|
|
|
|
def test_missing_rows_cols_are_warnings_not_errors(self, good_cache):
|
|
config = {'display': {'hardware': {'brightness': 90}}, 'timezone': 'UTC'}
|
|
validator = StartupValidator(make_config_manager(config))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
assert "Display hardware setting 'rows' not specified, using default" in warnings
|
|
assert "Display hardware setting 'cols' not specified, using default" in warnings
|
|
|
|
|
|
class TestCacheDirectory:
|
|
"""Cache directory validation error/warning split."""
|
|
|
|
def _patch_cache_dir(self, monkeypatch, cache_dir):
|
|
mock_cls = MagicMock()
|
|
mock_cls.return_value.get_cache_dir.return_value = cache_dir
|
|
monkeypatch.setattr("src.cache_manager.CacheManager", mock_cls)
|
|
|
|
def test_nonexistent_cache_dir_is_error(self, monkeypatch, tmp_path):
|
|
missing = str(tmp_path / "does_not_exist")
|
|
self._patch_cache_dir(monkeypatch, missing)
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
assert any("does not exist" in e and missing in e for e in errors)
|
|
|
|
def test_writable_cache_dir_no_errors(self, monkeypatch, tmp_path):
|
|
self._patch_cache_dir(monkeypatch, str(tmp_path))
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert not any('cache' in e.lower() for e in errors)
|
|
|
|
def test_unwritable_cache_dir_is_error(self, monkeypatch, tmp_path):
|
|
# Root (common in CI) can write anywhere, so chmod tricks don't
|
|
# work — force os.access to deny writes for the cache dir only.
|
|
cache_dir = str(tmp_path)
|
|
self._patch_cache_dir(monkeypatch, cache_dir)
|
|
real_access = os.access
|
|
|
|
def fake_access(path, mode):
|
|
if str(path) == cache_dir and mode == os.W_OK:
|
|
return False
|
|
return real_access(path, mode)
|
|
|
|
monkeypatch.setattr(os, "access", fake_access)
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
assert any("is not writable" in e for e in errors)
|
|
|
|
def test_none_cache_dir_is_warning_not_error(self, monkeypatch):
|
|
self._patch_cache_dir(monkeypatch, None)
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
assert "Cache directory not available - caching will be disabled" in warnings
|
|
|
|
def test_cache_manager_constructor_failure_is_warning(self, monkeypatch):
|
|
mock_cls = MagicMock(side_effect=RuntimeError("no disk"))
|
|
monkeypatch.setattr("src.cache_manager.CacheManager", mock_cls)
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
assert any(w.startswith("Could not validate cache directory:") for w in warnings)
|
|
|
|
|
|
class TestPlugins:
|
|
"""Plugin validation with a plugin manager present."""
|
|
|
|
def _config_with_plugins(self):
|
|
return {
|
|
'display': {'hardware': {'rows': 32, 'cols': 64}},
|
|
'schedule': {'enabled': True}, # reserved key that LOOKS enabled
|
|
'timezone': 'UTC',
|
|
'plugin_system': {},
|
|
'known': {'enabled': True},
|
|
'ghost': {'enabled': True},
|
|
}
|
|
|
|
def test_ghost_plugin_warns_and_reserved_keys_skipped(self, good_cache, tmp_path):
|
|
pm = MagicMock()
|
|
pm.discover_plugins.return_value = ['known']
|
|
known_dir = tmp_path / "known"
|
|
known_dir.mkdir()
|
|
(known_dir / "manifest.json").write_text("{}")
|
|
pm.get_plugin_directory.return_value = str(known_dir)
|
|
|
|
validator = StartupValidator(make_config_manager(self._config_with_plugins()), pm)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert "Plugin 'ghost' is enabled but not found in plugins directory" in warnings
|
|
# Reserved sections are never treated as plugins, even when they
|
|
# contain an 'enabled' flag (schedule above).
|
|
for reserved in ('display', 'schedule', 'timezone', 'plugin_system'):
|
|
assert not any(f"'{reserved}'" in w for w in warnings)
|
|
|
|
def test_enabled_plugin_missing_manifest_is_error(self, good_cache, tmp_path):
|
|
pm = MagicMock()
|
|
pm.discover_plugins.return_value = ['known']
|
|
plugin_dir = tmp_path / "known"
|
|
plugin_dir.mkdir() # exists, but no manifest.json inside
|
|
pm.get_plugin_directory.return_value = str(plugin_dir)
|
|
|
|
config = dict(GOOD_CONFIG, known={'enabled': True})
|
|
validator = StartupValidator(make_config_manager(config), pm)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is False
|
|
assert "Plugin 'known' manifest.json not found" in errors
|
|
|
|
def test_disabled_plugin_not_checked_for_manifest(self, good_cache, tmp_path):
|
|
pm = MagicMock()
|
|
pm.discover_plugins.return_value = ['known']
|
|
pm.get_plugin_directory.return_value = str(tmp_path / "nowhere")
|
|
|
|
config = dict(GOOD_CONFIG, known={'enabled': False})
|
|
validator = StartupValidator(make_config_manager(config), pm)
|
|
is_valid, errors, warnings = validator.validate_all()
|
|
assert is_valid is True
|
|
assert errors == []
|
|
|
|
|
|
class TestIdempotence:
|
|
"""validate_all() resets error/warning state each run (the fixed bug)."""
|
|
|
|
def test_repeated_runs_do_not_accumulate(self, good_cache):
|
|
validator = StartupValidator(make_config_manager({}))
|
|
first = validator.validate_all()
|
|
second = validator.validate_all()
|
|
assert first == second
|
|
assert len(second[1]) == len(first[1])
|
|
assert len(second[2]) == len(first[2])
|
|
|
|
|
|
class TestRaiseOnErrors:
|
|
"""Exception classification and precedence in raise_on_errors()."""
|
|
|
|
def _validator(self, errors):
|
|
validator = StartupValidator(make_config_manager(GOOD_CONFIG))
|
|
validator.errors = list(errors)
|
|
return validator
|
|
|
|
def test_no_errors_returns_none(self):
|
|
assert self._validator([]).raise_on_errors() is None
|
|
|
|
def test_config_error(self):
|
|
msg = "Missing required configuration key: display"
|
|
with pytest.raises(ConfigError) as excinfo:
|
|
self._validator([msg]).raise_on_errors()
|
|
assert excinfo.value.message == "Configuration validation failed"
|
|
assert msg in excinfo.value.context['errors']
|
|
|
|
def test_cache_error(self):
|
|
msg = "Cache directory does not exist: /nope"
|
|
with pytest.raises(CacheError) as excinfo:
|
|
self._validator([msg]).raise_on_errors()
|
|
assert msg in excinfo.value.context['errors']
|
|
|
|
def test_plugin_error(self):
|
|
msg = "Plugin 'known' manifest.json not found"
|
|
with pytest.raises(PluginError) as excinfo:
|
|
self._validator([msg]).raise_on_errors()
|
|
assert msg in excinfo.value.context['errors']
|
|
|
|
def test_unclassified_error_falls_back_to_config_error(self):
|
|
msg = "Something entirely else went wrong"
|
|
with pytest.raises(ConfigError) as excinfo:
|
|
self._validator([msg]).raise_on_errors()
|
|
assert excinfo.value.message == "Startup validation failed"
|
|
assert msg in excinfo.value.context['errors']
|
|
|
|
def test_precedence_config_beats_cache(self):
|
|
# A message matching both 'config' and 'cache' substrings raises
|
|
# ConfigError because config classification is checked first.
|
|
msg = "config problem touching the cache layer"
|
|
with pytest.raises(ConfigError) as excinfo:
|
|
self._validator([msg]).raise_on_errors()
|
|
assert excinfo.value.message == "Configuration validation failed"
|
|
assert msg in excinfo.value.context['errors']
|