mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-08-08 12:18:06 +00:00
* refactor(web): use canonical secret helpers in api_v3; make ConfigManager secret strip/merge array-aware
api_v3.py carried three inline nested copies of find_secret_fields/
separate_secrets (main-config save, plugin-config save, plugin-config
reset). They drifted from each other (one lacked isinstance guards) and
none supported the canonical module's array-item secrets
(accounts[].token). All three endpoints now import from
src/web_interface/secret_helpers.
Adopting the canonical behavior makes array-item secrets reachable, and
their parallel-placeholder shape ([{'token': ...}, {}] alongside the
regular list) was not survivable by ConfigManager's round-trip:
_strip_secrets_recursive dropped the whole key (losing the regular
fields from config.json) and _deep_merge replaced the regular list
wholesale on load. Both are now array-aware:
- strip removes the secret fields from each item and ALWAYS keeps the
list so indices survive for merge-on-load; whole-key secrets (scalar
lists, shape mismatches) still drop the key entirely — never leak.
- merge folds each secrets item into the config item at the same index,
skipping {} placeholders. The regular list's length is authoritative
in both directions: a user deleting an array item never has it
resurrected from a stale secrets entry (extras warn and are ignored).
api_v3's own deep_merge intentionally still replaces lists wholesale —
form posts carry complete arrays and index-merging would resurrect
deleted items; a comment now documents that.
Tests: the parity guard flips from 'exactly 3 inline copies' to 'zero,
and the canonical import must exist'; TestArraySecretStripAndMerge
covers the new strip/merge semantics incl. length-mismatch contracts;
new test_api_v3_secret_roundtrip.py drives all three endpoints through
a Flask client with a REAL ConfigManager+SchemaManager over tmp_path,
proving secrets land in config_secrets.json, config.json stays clean,
and a fresh load merges them back into the right array items.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* fix: repair broken helper paths across display, cache, odds, logging, resolver, repos, config, validator
Nine fixes for bugs surfaced while writing coverage for previously
untested modules (plus the bool-duration quirk pinned in PR #441):
- base_plugin.get_display_duration: exclude bools from both numeric
branches — display_duration=True no longer reads as a 1-second slot;
it falls through to config, then the 15.0 default.
- display_helper: draw_error_message/draw_no_data_message called
_draw_centered_text with the wrong arguments and crashed with
AttributeError — both now delegate to draw_centered_text.
draw_scorebug_layout drew status and clock at the same y, overprinting
each other — they now share one combined top line.
draw_ticker_layout drew its text starting at x=display_width (fully
off-canvas), returning a blank frame every time — now draws at x=0;
scroll_speed stays accepted-but-unused and is documented as such.
- api_helper.clear_cache guarded on a nonexistent CacheManager.clear()
method, silently never clearing anything; it now uses the real surface
(clear_cache/delete/list_cache_files) and no-ops safely otherwise.
- base_odds_manager._extract_espn_data raised AttributeError when ESPN
sent explicit JSON nulls ("homeTeamOdds": null) — every level now
null-safes with 'or {}'. format_odds_summary gated on
is_odds_available, which deliberately ignores money lines, so
ML-only odds formatted as "No odds available" — it now gates only on
empty/no_odds data and formats money lines.
- logging_config.ContextualFormatter mutated record.msg in place, so a
second handler prepended the context prefix twice; it now formats a
copy. log_error hardcoded exc_info=True and raised TypeError when the
caller passed exc_info — now kwargs.setdefault.
- dynamic_team_resolver wrote its "shared" class cache through self,
creating instance shadows — the cache was per-instance and every
scoreboard refetched rankings. Writes now go through the class.
- saved_repositories cleaned URLs with an unanchored .replace('.git','')
that mangled URLs merely containing '.git' (my.github.io -> myhub.io);
now strips only a trailing suffix. add/remove also roll back the
in-memory list when the save fails, so memory always matches disk.
- config_helper.merge_configs shallow-copied the base, aliasing every
un-overridden nested dict into the result — now deep-copies.
- startup_validator.validate_all accumulated errors/warnings across
calls — now resets both lists per run.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* test: cover the previously untested modules
Nine new suites plus an extension, asserting the Phase-1b fixed behavior
and pinning the quirks deliberately left alone:
- test_logging_config.py: formatters (JSON shape, no record mutation,
single prefix through two handlers), PluginLoggerAdapter precedence,
setup_logging handler hygiene and LEDMATRIX_DEBUG, log_error exc_info.
- test_startup_validator.py: exact messages, error-vs-warning split,
accessor split (load_config vs get_config), cache-dir branches with
os.access monkeypatched (root can write anything in CI), idempotence,
raise_on_errors classification precedence.
- test_config_helper.py (full): load/save round trips, dot-notation
get/set incl. silent-failure contract, post-fix no-aliasing merge,
schema validation branches, the '{id}_config' key pin, default-enabled
pin.
- test_saved_repositories.py: three load shapes, bare-list rewrite pin,
trailing-only .git strip (my.github.io regression), save-failure
rollback, type-classification case-sensitivity pin.
- test_api_helper.py: rate-limit math, cache-hit short circuit, ESPN
URL/key formats, exact User-Agent guard, retry adapter, post-fix
clear_cache against the real CacheManager surface, ttl-dropped pin.
- test_base_odds_manager.py: cache-key/URL construction, no_odds
sentinel round trip, stale-cache fallback, null-safe extraction,
ML-only formatting, is_odds_available truth table (ML-blind by
contract), config key/attr mismatch pin.
- test_dynamic_team_resolver.py: expansion/dedup/slicing, dropped
unknown-dynamic names (TOP_ substring hazard pinned), genuinely
shared class cache (second instance: zero HTTP), TTL expiry,
failure degradation without raising.
- test_display_helper.py (full): the fixed error/no-data renders,
combined scorebug top line, non-blank ticker with scroll_speed
no-op pin, composite upconversion, logo bleed positions, square
orientation pin.
- test_skin_runtime_cache.py: discovery-cache hit/invalidation
semantics (manifest mtime, .py edits pinned as non-invalidating),
sys.modules namespacing contract incl. bare-name restore and stdlib
shadowing, entry-module execute-once, API minor-version tolerance,
skin_matches_target table.
- test_sports_capabilities.py (extended): _draw_celebration_layout
executed for real (flash window, matrix-dims fallback, highlight
alternation, logo-failure isolation), _should_celebrate_for direct,
strict duration boundary, score_to_int edges, both-teams-score
precedence, expired-coalesce refire, disabled-win baseline
preservation, id-less prune.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* test: real schedule/dim coverage for DisplayController; fix two vacuous schedule tests
New test_display_controller_schedule.py drives _check_schedule and
_check_dim_schedule on a bare controller stub: same-day and
midnight-crossing windows with inclusive boundaries, global vs per-day vs
legacy-inferred modes (and dim's global-only default — no legacy
inference), per-day disabled days, invalid %H:%M fallbacks, unknown
timezone -> UTC, dim_brightness default 30, inactive-display short
circuit, and the _was_display_active/_was_dimmed transition flags.
test_display_controller.py's test_schedule_disabled and
test_active_hours patched config_service.get_config — which
_check_schedule never reads — so both asserted the init-default value
and could not fail. Rewritten on the test_inactive_hours pattern
(inject controller.config['schedule'], reset the minute gate, flip the
flag to the opposite state first so the assertion has teeth).
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* ci: raise coverage floor to 48%
Measured 50% with the new suites in place (was 47% baseline when the
gate was introduced at 45); floor stays two points under measured.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
* fix: address CodeQL alert and review findings
- config_manager: the "secrets list longer than config list" warning now
interpolates only config-side data (no key name or secrets-derived
values), resolving the CodeQL clear-text-logging alert.
- base_plugin: validate_config rejects bool display_duration, matching
get_display_duration (bool is an int subclass and would otherwise pass
as a positive number).
- config_helper: merge_configs deep-copies override values in the
non-recursive branch so mutating the merged result cannot reach back
into override_config.
- saved_repositories: saves are atomic (temp file + fsync + os.replace),
so a failed write can no longer truncate saved_repositories.json.
- tests: regression cases for each fix, plus a pin that whole-item
array secrets (key[] + key[].field both marked) strip to empty {}
skeletons — no secret values can reach config.json.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01NohXi78cwsAKtN1sCfxjUh
---------
Co-authored-by: Claude <noreply@anthropic.com>
278 lines
10 KiB
Python
278 lines
10 KiB
Python
"""
|
|
Behavioral tests for DisplayController._check_schedule and
|
|
_check_dim_schedule — the on/off window and night-dimming logic.
|
|
|
|
test_display_controller_optimizations.py::TestScheduleMinuteGate already
|
|
covers the once-per-minute gating; this file covers what it doesn't:
|
|
midnight-crossing windows, mode selection (global / per-day / legacy
|
|
inference), per-day disabled days, invalid time strings, unknown
|
|
timezones, boundary equality, and the transition-tracking flags.
|
|
|
|
Both methods read only self.config and a handful of instance attributes,
|
|
so a bare stub via object.__new__ (the test_display_controller_vegas_tick
|
|
pattern) is enough — no managers needed.
|
|
"""
|
|
|
|
import os
|
|
from datetime import datetime
|
|
|
|
from unittest.mock import patch
|
|
|
|
import pytest
|
|
|
|
os.environ.setdefault("EMULATOR", "true")
|
|
|
|
from src.display_controller import DisplayController # noqa: E402
|
|
|
|
|
|
def make_controller(config=None, *, normal_brightness=90):
|
|
dc = object.__new__(DisplayController)
|
|
dc.config = config or {}
|
|
dc._tz = None
|
|
dc._schedule_checked_minute = None
|
|
dc.is_display_active = True
|
|
dc._was_display_active = True
|
|
dc._normal_brightness = normal_brightness
|
|
dc._dim_checked_minute = None
|
|
dc._cached_target_brightness = None
|
|
dc.is_dimmed = False
|
|
dc._was_dimmed = False
|
|
return dc
|
|
|
|
|
|
def at(time_str, day="monday"):
|
|
"""Context manager patching the controller module's clock."""
|
|
patcher = patch("src.display_controller.datetime")
|
|
mock_dt = patcher.start()
|
|
mock_dt.strptime = datetime.strptime
|
|
mock_dt.now.return_value.time.return_value = (
|
|
datetime.strptime(time_str, "%H:%M").time())
|
|
mock_dt.now.return_value.strftime.return_value.lower.return_value = day
|
|
mock_dt.now.return_value.hour = int(time_str.split(":")[0])
|
|
mock_dt.now.return_value.minute = int(time_str.split(":")[1])
|
|
return patcher
|
|
|
|
|
|
@pytest.fixture
|
|
def clock():
|
|
patchers = []
|
|
|
|
def _at(time_str, day="monday"):
|
|
patchers.append(p := at(time_str, day))
|
|
return p
|
|
|
|
yield _at
|
|
for p in patchers:
|
|
p.stop()
|
|
|
|
|
|
def check_at(dc, time_str, day="monday", clock=None):
|
|
"""Run _check_schedule at a mocked wall time, resetting the minute gate."""
|
|
dc._schedule_checked_minute = None
|
|
p = at(time_str, day)
|
|
try:
|
|
dc._check_schedule()
|
|
finally:
|
|
p.stop()
|
|
return dc.is_display_active
|
|
|
|
|
|
def dim_at(dc, time_str, day="monday"):
|
|
dc._dim_checked_minute = None
|
|
p = at(time_str, day)
|
|
try:
|
|
return dc._check_dim_schedule()
|
|
finally:
|
|
p.stop()
|
|
|
|
|
|
class TestScheduleWindows:
|
|
def _config(self, start, end, **extra):
|
|
return {"schedule": {"enabled": True, "start_time": start,
|
|
"end_time": end, **extra},
|
|
"timezone": "UTC"}
|
|
|
|
def test_same_day_window(self):
|
|
dc = make_controller(self._config("09:00", "17:00"))
|
|
assert check_at(dc, "12:00") is True
|
|
assert check_at(dc, "20:00") is False
|
|
assert check_at(dc, "08:59") is False
|
|
|
|
def test_boundaries_are_inclusive(self):
|
|
dc = make_controller(self._config("09:00", "17:00"))
|
|
assert check_at(dc, "09:00") is True # now == start
|
|
assert check_at(dc, "17:00") is True # now == end
|
|
|
|
def test_midnight_crossing_window(self):
|
|
# 21:00 -> 07:00: active late evening AND early morning, inactive
|
|
# mid-day.
|
|
dc = make_controller(self._config("21:00", "07:00"))
|
|
assert check_at(dc, "23:00") is True
|
|
assert check_at(dc, "03:00") is True
|
|
assert check_at(dc, "12:00") is False
|
|
assert check_at(dc, "21:00") is True # boundary
|
|
assert check_at(dc, "07:00") is True # boundary
|
|
|
|
def test_no_schedule_config_is_always_active(self):
|
|
dc = make_controller({"timezone": "UTC"})
|
|
dc.is_display_active = False
|
|
dc._check_schedule()
|
|
assert dc.is_display_active is True
|
|
|
|
def test_invalid_time_string_falls_back_to_active(self):
|
|
dc = make_controller(self._config("9 o'clock", "17:00"))
|
|
dc.is_display_active = False
|
|
assert check_at(dc, "03:00") is True # ValueError -> stay on
|
|
|
|
def test_unknown_timezone_falls_back_to_utc(self):
|
|
dc = make_controller({"schedule": {"enabled": True,
|
|
"start_time": "09:00",
|
|
"end_time": "17:00"},
|
|
"timezone": "Mars/Olympus_Mons"})
|
|
assert check_at(dc, "12:00") is True
|
|
import pytz
|
|
assert dc._tz is pytz.UTC
|
|
|
|
|
|
class TestScheduleModes:
|
|
DAYS = {
|
|
"monday": {"enabled": True, "start_time": "10:00",
|
|
"end_time": "18:00"},
|
|
"tuesday": {"enabled": False},
|
|
}
|
|
|
|
def test_global_mode_ignores_days(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True, "mode": "global",
|
|
"start_time": "09:00", "end_time": "17:00",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
# 09:30 is inside the global window but outside monday's per-day one.
|
|
assert check_at(dc, "09:30", day="monday") is True
|
|
|
|
def test_per_day_mode_uses_day_window(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True, "mode": "per-day",
|
|
"start_time": "09:00", "end_time": "17:00",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
assert check_at(dc, "09:30", day="monday") is False # before 10:00
|
|
assert check_at(dc, "12:00", day="monday") is True
|
|
|
|
def test_per_day_underscore_spelling_accepted(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True, "mode": "per_day",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
assert check_at(dc, "12:00", day="monday") is True
|
|
|
|
def test_legacy_no_mode_infers_per_day_from_days_config(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True,
|
|
"start_time": "09:00", "end_time": "17:00",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
assert check_at(dc, "09:30", day="monday") is False # per-day won
|
|
|
|
def test_per_day_disabled_day_turns_display_off(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True, "mode": "per-day",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
assert check_at(dc, "12:00", day="tuesday") is False
|
|
|
|
def test_per_day_missing_day_falls_back_to_global(self):
|
|
dc = make_controller({"schedule": {
|
|
"enabled": True, "mode": "per-day",
|
|
"start_time": "09:00", "end_time": "17:00",
|
|
"days": self.DAYS}, "timezone": "UTC"})
|
|
# Wednesday has no per-day entry -> global window applies.
|
|
assert check_at(dc, "09:30", day="wednesday") is True
|
|
|
|
def test_missing_enabled_key_means_enabled(self):
|
|
# Backward compat: schedules written before the enabled flag.
|
|
dc = make_controller({"schedule": {
|
|
"start_time": "09:00", "end_time": "17:00"}, "timezone": "UTC"})
|
|
assert check_at(dc, "20:00") is False
|
|
|
|
|
|
class TestScheduleTransitions:
|
|
def test_was_display_active_tracks_state(self):
|
|
dc = make_controller({"schedule": {"enabled": True,
|
|
"start_time": "09:00",
|
|
"end_time": "17:00"},
|
|
"timezone": "UTC"})
|
|
check_at(dc, "12:00")
|
|
assert dc._was_display_active is True
|
|
check_at(dc, "20:00")
|
|
assert dc._was_display_active is False
|
|
check_at(dc, "12:05")
|
|
assert dc._was_display_active is True
|
|
|
|
|
|
class TestDimSchedule:
|
|
def _config(self, start="20:00", end="07:00", **extra):
|
|
return {"dim_schedule": {"enabled": True, "start_time": start,
|
|
"end_time": end, "dim_brightness": 25,
|
|
**extra},
|
|
"timezone": "UTC"}
|
|
|
|
def test_disabled_by_default(self):
|
|
dc = make_controller({"dim_schedule": {"start_time": "20:00",
|
|
"end_time": "07:00"},
|
|
"timezone": "UTC"})
|
|
# Unlike the on/off schedule, dimming defaults to DISABLED when the
|
|
# enabled key is missing.
|
|
assert dim_at(dc, "23:00") == 90
|
|
assert dc.is_dimmed is False
|
|
|
|
def test_overnight_dim_window(self):
|
|
dc = make_controller(self._config())
|
|
assert dim_at(dc, "23:00") == 25
|
|
assert dc.is_dimmed is True
|
|
assert dim_at(dc, "03:00") == 25
|
|
assert dim_at(dc, "12:00") == 90
|
|
assert dc.is_dimmed is False
|
|
|
|
def test_dim_brightness_defaults_to_30(self):
|
|
dc = make_controller({"dim_schedule": {"enabled": True,
|
|
"start_time": "20:00",
|
|
"end_time": "07:00"},
|
|
"timezone": "UTC"})
|
|
assert dim_at(dc, "23:00") == 30
|
|
|
|
def test_inactive_display_short_circuits_undimmed(self):
|
|
dc = make_controller(self._config())
|
|
dc.is_display_active = False
|
|
dc.is_dimmed = True
|
|
assert dim_at(dc, "23:00") == 90
|
|
assert dc.is_dimmed is False
|
|
|
|
def test_per_day_mode(self):
|
|
dc = make_controller(self._config(mode="per-day", days={
|
|
"monday": {"enabled": True, "start_time": "22:00",
|
|
"end_time": "06:00"},
|
|
"tuesday": {"enabled": False},
|
|
}))
|
|
assert dim_at(dc, "23:00", day="monday") == 25
|
|
assert dim_at(dc, "21:00", day="monday") == 90 # before per-day start
|
|
assert dim_at(dc, "23:00", day="tuesday") == 90 # day disabled
|
|
assert dc.is_dimmed is False
|
|
|
|
def test_no_legacy_inference_for_dim(self):
|
|
# Unlike _check_schedule, dim mode defaults to GLOBAL even when a
|
|
# days config exists — no legacy inference.
|
|
dc = make_controller(self._config(days={
|
|
"monday": {"enabled": True, "start_time": "22:00",
|
|
"end_time": "06:00"},
|
|
}))
|
|
# 21:00 is inside the global 20:00-07:00 window but outside monday's
|
|
# per-day 22:00 start; global mode wins.
|
|
assert dim_at(dc, "21:00", day="monday") == 25
|
|
|
|
def test_invalid_time_string_returns_normal(self):
|
|
dc = make_controller(self._config(start="late"))
|
|
assert dim_at(dc, "23:00") == 90
|
|
|
|
def test_was_dimmed_tracks_transitions(self):
|
|
dc = make_controller(self._config())
|
|
dim_at(dc, "23:00")
|
|
assert dc._was_dimmed is True
|
|
dim_at(dc, "12:00")
|
|
assert dc._was_dimmed is False
|