mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 14:25:08 +00:00
* fix(core): font zip cache, monotonic timers, resolver back-off, and other core/common fixes - font_manager: a .zip font URL is served as its extracted font after a restart (the cached-file check returned the archive first); downloads use requests with a 30s timeout into a temp file + os.replace. - api_helper / sync_manager: rate-limit and heartbeat/leader timeouts use time.monotonic(); last_request_time and the status file's ts stay wall-clock. set_on_new_cycle docstring no longer claims core uses it. - logo_helper: the placeholder uses the same scaled box as a real logo. - permission_utils: one _sudo_bash_candidates() helper (with the sudoers exact-argv rationale) shared by sudo_remove_directory, which now retries the next bash path on a sudo refusal, and install_requirements_file. - dynamic_team_resolver: failed/empty fetch backs off 5 min; duplicate INFO log and contradictory docstring example fixed. - element_style: scale default looked up through element aliases. - background_data_service: cache-hit callback runs outside the lock. - config_arrays: union-aware type check (["array","null"]); stale dotToNested() reference removed. - auto_update_setup: non-dict auto_update reads as off; temp result file unlinked when the write fails. - exceptions: constructors copy the caller's context dict. - logging_config: StructuredFormatter json.dumps(default=str). - error_aggregator: removed unused export_path/export_to_file/_auto_export. - Docstrings: validate_file_upload max_size_mb, raise_on_errors. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(sync): retry the status-file rename like the other atomic writers On Windows os.replace can fail with "Access is denied" while a scanner briefly holds the target open; config_manager_atomic._replace already retries that (and re-raises at once on other platforms). The sync status writer called os.replace directly, which made test_concurrent_writers_each_use_their_own_temp_file flaky on Windows. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
287 lines
11 KiB
Python
287 lines
11 KiB
Python
"""
|
|
Tests for src/dynamic_team_resolver.py (DynamicTeamResolver).
|
|
|
|
Covers dynamic team expansion (AP_TOP_5/10/25), order-preserving dedup,
|
|
unknown dynamic-name dropping, rankings parsing, the fixed genuinely
|
|
class-shared rankings cache (fetch and clear_cache write through
|
|
DynamicTeamResolver._rankings_cache / _cache_timestamp), TTL expiry,
|
|
network-failure resilience, and the resolve_dynamic_teams module function.
|
|
|
|
No real network: src.dynamic_team_resolver.requests.get is always patched.
|
|
"""
|
|
|
|
import types
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
import pytest
|
|
import requests
|
|
|
|
import src.dynamic_team_resolver as dtr_module
|
|
from src.dynamic_team_resolver import DynamicTeamResolver, resolve_dynamic_teams
|
|
|
|
|
|
TOP_TEAMS = ['UGA', 'MICH', 'OSU', 'TEX', 'ALA', 'ORE', 'PSU', 'ND', 'FSU', 'OU']
|
|
|
|
|
|
def _rankings_payload(teams=None):
|
|
teams = TOP_TEAMS if teams is None else teams
|
|
return {
|
|
'rankings': [{
|
|
'name': 'AP Top 25',
|
|
'ranks': [
|
|
{'current': i + 1, 'team': {'abbreviation': abbr}}
|
|
for i, abbr in enumerate(teams)
|
|
],
|
|
}]
|
|
}
|
|
|
|
|
|
def _make_response(payload):
|
|
response = MagicMock()
|
|
response.json.return_value = payload
|
|
response.raise_for_status.return_value = None
|
|
return response
|
|
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def reset_class_cache():
|
|
"""Reset the CLASS-level shared cache between tests."""
|
|
DynamicTeamResolver._rankings_cache = {}
|
|
DynamicTeamResolver._cache_timestamp = 0
|
|
DynamicTeamResolver._failure_timestamp = 0
|
|
yield
|
|
DynamicTeamResolver._rankings_cache = {}
|
|
DynamicTeamResolver._cache_timestamp = 0
|
|
DynamicTeamResolver._failure_timestamp = 0
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_get():
|
|
with patch('src.dynamic_team_resolver.requests.get') as m:
|
|
m.return_value = _make_response(_rankings_payload())
|
|
yield m
|
|
|
|
|
|
@pytest.fixture
|
|
def resolver():
|
|
return DynamicTeamResolver()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# resolve_teams basics
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestResolveTeamsBasics:
|
|
def test_empty_list_returns_empty_no_http(self, resolver, mock_get):
|
|
assert resolver.resolve_teams([]) == []
|
|
mock_get.assert_not_called()
|
|
|
|
def test_no_dynamic_names_passthrough_no_http(self, resolver, mock_get):
|
|
assert resolver.resolve_teams(['UGA', 'AUB', 'LSU']) == [
|
|
'UGA', 'AUB', 'LSU']
|
|
mock_get.assert_not_called()
|
|
|
|
def test_expansion_inserted_in_place_order_preserved(
|
|
self, resolver, mock_get):
|
|
result = resolver.resolve_teams(['UGA', 'AP_TOP_5', 'AUB'])
|
|
|
|
# UGA is also ranked #1, so dedup keeps its first occurrence; the
|
|
# top-5 expansion lands where AP_TOP_5 appeared, AUB stays after.
|
|
assert result == ['UGA', 'MICH', 'OSU', 'TEX', 'ALA', 'AUB']
|
|
|
|
def test_order_preserving_dedup(self, resolver, mock_get):
|
|
result = resolver.resolve_teams(['UGA', 'AP_TOP_5', 'UGA'])
|
|
|
|
assert result == ['UGA', 'MICH', 'OSU', 'TEX', 'ALA']
|
|
assert result.count('UGA') == 1
|
|
assert result[0] == 'UGA'
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# AP_TOP_N slicing
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestSlicing:
|
|
def test_top_n_counts_and_order(self, resolver, mock_get):
|
|
teams_25 = [f'T{i:02d}' for i in range(1, 26)]
|
|
mock_get.return_value = _make_response(_rankings_payload(teams_25))
|
|
|
|
top5 = resolver.resolve_teams(['AP_TOP_5'])
|
|
top10 = resolver.resolve_teams(['AP_TOP_10'])
|
|
top25 = resolver.resolve_teams(['AP_TOP_25'])
|
|
|
|
assert top5 == teams_25[:5]
|
|
assert top10 == teams_25[:10]
|
|
assert top25 == teams_25
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Unknown dynamic-looking names
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestUnknownDynamicNames:
|
|
def test_unknown_dynamic_looking_names_dropped(self, resolver, mock_get):
|
|
result = resolver.resolve_teams(
|
|
['AP_TOP_100', 'TOP_10', 'RANKED_ALL', 'PLAYOFF_TEAMS'])
|
|
|
|
assert result == []
|
|
mock_get.assert_not_called()
|
|
|
|
def test_top_substring_hazard(self, resolver, mock_get):
|
|
# Hazard pin: _is_potential_dynamic_team matches the substring
|
|
# 'TOP_' anywhere in the (upper-cased) name, so a team literally
|
|
# named 'TOP_GUN' is dropped as an unknown dynamic team too.
|
|
assert resolver.resolve_teams(['TOP_GUN']) == []
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Rankings parsing
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestRankingsParsing:
|
|
def test_drops_zero_rank_and_empty_abbreviation_sorts_ascending(
|
|
self, resolver, mock_get):
|
|
payload = {
|
|
'rankings': [{
|
|
'name': 'AP Top 25',
|
|
'ranks': [
|
|
{'current': 3, 'team': {'abbreviation': 'C3'}},
|
|
{'current': 1, 'team': {'abbreviation': 'A1'}},
|
|
{'current': 0, 'team': {'abbreviation': 'ZERO'}},
|
|
{'current': 4, 'team': {'abbreviation': ''}},
|
|
{'current': 2, 'team': {'abbreviation': 'B2'}},
|
|
],
|
|
}]
|
|
}
|
|
mock_get.return_value = _make_response(payload)
|
|
|
|
rankings = resolver._fetch_ncaa_fb_rankings()
|
|
|
|
assert list(rankings.keys()) == ['A1', 'B2', 'C3']
|
|
assert list(rankings.values()) == [1, 2, 3]
|
|
|
|
def test_empty_rankings_returns_empty_and_backs_off(
|
|
self, resolver, mock_get, monkeypatch):
|
|
mock_get.return_value = _make_response({'rankings': []})
|
|
|
|
assert resolver._fetch_ncaa_fb_rankings() == {}
|
|
# No rankings were cached, but the failure is: the next call inside
|
|
# the back-off window doesn't hit HTTP again.
|
|
assert resolver._fetch_ncaa_fb_rankings() == {}
|
|
assert mock_get.call_count == 1
|
|
assert DynamicTeamResolver._rankings_cache == {}
|
|
|
|
stamp = DynamicTeamResolver._failure_timestamp
|
|
monkeypatch.setattr(
|
|
dtr_module, 'time', types.SimpleNamespace(time=lambda: stamp + 301))
|
|
assert resolver._fetch_ncaa_fb_rankings() == {}
|
|
assert mock_get.call_count == 2
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Shared class cache (fixed behavior)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestSharedCache:
|
|
def test_cache_shared_across_instances(self, mock_get):
|
|
resolver1 = DynamicTeamResolver()
|
|
resolver1.resolve_teams(['AP_TOP_5'])
|
|
assert mock_get.call_count == 1
|
|
|
|
resolver2 = DynamicTeamResolver()
|
|
result = resolver2.resolve_teams(['AP_TOP_5'])
|
|
|
|
# Post-fix: the class-level cache serves the second instance with
|
|
# ZERO additional HTTP calls.
|
|
assert result == TOP_TEAMS[:5]
|
|
assert mock_get.call_count == 1
|
|
|
|
def test_ttl_expiry_refetches(self, resolver, mock_get, monkeypatch):
|
|
resolver.resolve_teams(['AP_TOP_5'])
|
|
assert mock_get.call_count == 1
|
|
|
|
stamp = DynamicTeamResolver._cache_timestamp
|
|
monkeypatch.setattr(
|
|
dtr_module, 'time', types.SimpleNamespace(time=lambda: stamp + 3601))
|
|
|
|
resolver.resolve_teams(['AP_TOP_5'])
|
|
assert mock_get.call_count == 2
|
|
|
|
def test_clear_cache_through_one_instance_affects_all(self, mock_get):
|
|
resolver1 = DynamicTeamResolver()
|
|
resolver1.resolve_teams(['AP_TOP_5'])
|
|
assert mock_get.call_count == 1
|
|
|
|
resolver2 = DynamicTeamResolver()
|
|
resolver2.clear_cache()
|
|
|
|
# Post-fix: clear_cache writes through the class, so resolver1
|
|
# must refetch even though resolver2 did the clearing.
|
|
resolver1.resolve_teams(['AP_TOP_5'])
|
|
assert mock_get.call_count == 2
|
|
|
|
def test_module_function_benefits_from_class_cache(self, mock_get):
|
|
# resolve_dynamic_teams constructs a fresh resolver per call, but
|
|
# the class-shared cache means only the first call hits HTTP.
|
|
first = resolve_dynamic_teams(['AP_TOP_5'])
|
|
second = resolve_dynamic_teams(['AP_TOP_5'])
|
|
|
|
assert first == second == TOP_TEAMS[:5]
|
|
assert mock_get.call_count == 1
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Failure handling
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestFailureHandling:
|
|
def test_network_failure_drops_dynamic_keeps_static_caches_nothing(
|
|
self, resolver, mock_get, monkeypatch):
|
|
mock_get.side_effect = [
|
|
requests.exceptions.RequestException('boom'),
|
|
_make_response(_rankings_payload()),
|
|
]
|
|
|
|
result = resolver.resolve_teams(['UGA', 'AP_TOP_5'])
|
|
|
|
# Dynamic name silently dropped, static name kept, nothing raises.
|
|
assert result == ['UGA']
|
|
|
|
# Inside the back-off window the outage isn't retried: each resolve
|
|
# would otherwise wait out the full request timeout again.
|
|
assert resolver.resolve_teams(['UGA', 'AP_TOP_5']) == ['UGA']
|
|
assert mock_get.call_count == 1
|
|
|
|
# No rankings were cached on failure: once the window passes, the
|
|
# next call refetches and succeeds.
|
|
stamp = DynamicTeamResolver._failure_timestamp
|
|
monkeypatch.setattr(
|
|
dtr_module, 'time', types.SimpleNamespace(time=lambda: stamp + 301))
|
|
result = resolver.resolve_teams(['UGA', 'AP_TOP_5'])
|
|
assert result == ['UGA', 'MICH', 'OSU', 'TEX', 'ALA']
|
|
assert mock_get.call_count == 2
|
|
|
|
def test_clear_cache_forgets_a_failure(self, resolver, mock_get):
|
|
mock_get.side_effect = [
|
|
requests.exceptions.RequestException('boom'),
|
|
_make_response(_rankings_payload()),
|
|
]
|
|
assert resolver.resolve_teams(['AP_TOP_5']) == []
|
|
resolver.clear_cache()
|
|
assert resolver.resolve_teams(['AP_TOP_5']) == TOP_TEAMS[:5]
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# sport argument
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestSportArgument:
|
|
def test_sport_arg_ignored_for_expansion(self, resolver, mock_get):
|
|
# Pin: the sport argument is effectively ignored — each pattern
|
|
# carries its own sport ('ncaa_fb'), so passing sport='nfl' still
|
|
# expands from the college-football rankings.
|
|
result = resolver.resolve_teams(['AP_TOP_5'], sport='nfl')
|
|
|
|
assert result == TOP_TEAMS[:5]
|
|
assert mock_get.call_count == 1
|