mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-04 22:35:08 +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>
365 lines
14 KiB
Python
365 lines
14 KiB
Python
"""
|
|
Tests for src/background_data_service.py
|
|
|
|
Covers BackgroundDataService: submit_fetch_request, get_result,
|
|
is_request_complete, get_request_status, cancel_request, get_statistics,
|
|
_cleanup_completed_requests, shutdown, and get_background_service singleton.
|
|
"""
|
|
|
|
import time
|
|
import pytest
|
|
from unittest.mock import MagicMock, patch, Mock
|
|
from concurrent.futures import Future
|
|
|
|
from src.background_data_service import (
|
|
BackgroundDataService,
|
|
FetchStatus,
|
|
FetchResult,
|
|
FetchRequest,
|
|
get_background_service,
|
|
shutdown_background_service,
|
|
)
|
|
import src.background_data_service as bds_module
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Fixtures
|
|
# ---------------------------------------------------------------------------
|
|
|
|
@pytest.fixture(autouse=True)
|
|
def reset_global_service():
|
|
"""Ensure each test starts with no global singleton."""
|
|
shutdown_background_service()
|
|
yield
|
|
shutdown_background_service()
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_cache_manager():
|
|
m = MagicMock()
|
|
m.get.return_value = None
|
|
m.set.return_value = None
|
|
m.generate_sport_cache_key.return_value = "test_key"
|
|
return m
|
|
|
|
|
|
@pytest.fixture
|
|
def service(mock_cache_manager):
|
|
svc = BackgroundDataService(mock_cache_manager, max_workers=2, request_timeout=5)
|
|
yield svc
|
|
svc.shutdown(wait=False)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Initialisation
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestInitialisation:
|
|
def test_stats_zeroed(self, service):
|
|
stats = service.get_statistics()
|
|
assert stats["total_requests"] == 0
|
|
assert stats["completed_requests"] == 0
|
|
assert stats["failed_requests"] == 0
|
|
|
|
def test_no_active_requests(self, service):
|
|
assert len(service.active_requests) == 0
|
|
|
|
def test_not_shutdown(self, service):
|
|
assert service._shutdown is False
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Cache hit path
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestCacheHit:
|
|
def test_cache_hit_returns_request_id(self, service, mock_cache_manager):
|
|
mock_cache_manager.get.return_value = {"events": [{"id": "1"}]}
|
|
req_id = service.submit_fetch_request(
|
|
sport="nfl", year=2024,
|
|
url="https://example.com/nfl",
|
|
cache_key="nfl_key",
|
|
)
|
|
assert req_id is not None
|
|
# Request should be immediately complete due to cache hit
|
|
result = service.get_result(req_id)
|
|
assert result is not None
|
|
assert result.success is True
|
|
assert result.cached is True
|
|
|
|
def test_cache_hit_increments_stat(self, service, mock_cache_manager):
|
|
mock_cache_manager.get.return_value = {"events": []}
|
|
service.submit_fetch_request(sport="nba", year=2024, url="https://x.com", cache_key="k")
|
|
stats = service.get_statistics()
|
|
assert stats["cached_hits"] == 1
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Actual fetch path (mocked HTTP)
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestFetchPath:
|
|
def _valid_payload(self) -> dict:
|
|
return {"events": [{"id": "g1"}, {"id": "g2"}]}
|
|
|
|
def test_successful_fetch_completes(self, service, mock_cache_manager):
|
|
mock_resp = Mock()
|
|
mock_resp.json.return_value = self._valid_payload()
|
|
mock_resp.raise_for_status.return_value = None
|
|
|
|
with patch.object(service.session, "get", return_value=mock_resp):
|
|
req_id = service.submit_fetch_request(
|
|
sport="nfl", year=2024,
|
|
url="https://example.com/nfl",
|
|
cache_key="nfl_test",
|
|
)
|
|
# Wait for the background thread
|
|
deadline = time.time() + 5
|
|
while not service.is_request_complete(req_id) and time.time() < deadline:
|
|
time.sleep(0.05)
|
|
|
|
result = service.get_result(req_id)
|
|
assert result is not None
|
|
assert result.success is True
|
|
assert result.data == self._valid_payload()
|
|
|
|
def test_failed_fetch_records_error(self, service, mock_cache_manager):
|
|
with patch.object(service.session, "get", side_effect=Exception("network error")):
|
|
req_id = service.submit_fetch_request(
|
|
sport="nba", year=2024,
|
|
url="https://example.com/nba",
|
|
cache_key="nba_test",
|
|
max_retries=0,
|
|
)
|
|
deadline = time.time() + 5
|
|
while not service.is_request_complete(req_id) and time.time() < deadline:
|
|
time.sleep(0.05)
|
|
|
|
result = service.get_result(req_id)
|
|
assert result is not None
|
|
assert result.success is False
|
|
assert result.error is not None
|
|
|
|
def test_cache_miss_increments_stat(self, service, mock_cache_manager):
|
|
mock_resp = Mock()
|
|
mock_resp.json.return_value = self._valid_payload()
|
|
mock_resp.raise_for_status.return_value = None
|
|
|
|
with patch.object(service.session, "get", return_value=mock_resp):
|
|
service.submit_fetch_request(
|
|
sport="nfl", year=2024, url="https://x.com", cache_key="new_key",
|
|
)
|
|
stats = service.get_statistics()
|
|
assert stats["cache_misses"] == 1
|
|
|
|
def test_callback_called_on_success(self, service, mock_cache_manager):
|
|
callback = Mock()
|
|
mock_resp = Mock()
|
|
mock_resp.json.return_value = self._valid_payload()
|
|
mock_resp.raise_for_status.return_value = None
|
|
|
|
with patch.object(service.session, "get", return_value=mock_resp):
|
|
req_id = service.submit_fetch_request(
|
|
sport="nfl", year=2024, url="https://x.com",
|
|
cache_key="cb_key", callback=callback, max_retries=0,
|
|
)
|
|
deadline = time.time() + 5
|
|
while not service.is_request_complete(req_id) and time.time() < deadline:
|
|
time.sleep(0.05)
|
|
|
|
callback.assert_called_once()
|
|
call_arg = callback.call_args[0][0]
|
|
assert isinstance(call_arg, FetchResult)
|
|
|
|
def test_data_cached_after_successful_fetch(self, service, mock_cache_manager):
|
|
mock_resp = Mock()
|
|
mock_resp.json.return_value = self._valid_payload()
|
|
mock_resp.raise_for_status.return_value = None
|
|
|
|
with patch.object(service.session, "get", return_value=mock_resp):
|
|
req_id = service.submit_fetch_request(
|
|
sport="nfl", year=2024, url="https://x.com", cache_key="cache_after_key",
|
|
)
|
|
deadline = time.time() + 5
|
|
while not service.is_request_complete(req_id) and time.time() < deadline:
|
|
time.sleep(0.05)
|
|
|
|
mock_cache_manager.set.assert_called()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Request status / cancel
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestRequestStatusAndCancel:
|
|
def test_unknown_request_status_is_none(self, service):
|
|
assert service.get_request_status("nonexistent") is None
|
|
|
|
def test_cancel_active_request(self, service, mock_cache_manager):
|
|
# Manually insert an active request
|
|
req = FetchRequest(
|
|
id="r1", sport="nfl", year=2024,
|
|
cache_key="k", url="https://x.com",
|
|
)
|
|
req.status = FetchStatus.PENDING
|
|
service.active_requests["r1"] = req
|
|
result = service.cancel_request("r1")
|
|
assert result is True
|
|
assert "r1" not in service.active_requests
|
|
|
|
def test_cancel_nonexistent_request(self, service):
|
|
assert service.cancel_request("does-not-exist") is False
|
|
|
|
def test_is_request_complete_false_for_active(self, service, mock_cache_manager):
|
|
req = FetchRequest(
|
|
id="r2", sport="mlb", year=2024,
|
|
cache_key="k2", url="https://x.com",
|
|
)
|
|
service.active_requests["r2"] = req
|
|
assert service.is_request_complete("r2") is False
|
|
|
|
def test_is_request_complete_true_for_done(self, service):
|
|
result = FetchResult(request_id="r3", success=True)
|
|
service.completed_requests["r3"] = result
|
|
assert service.is_request_complete("r3") is True
|
|
|
|
def test_get_result_returns_none_for_unknown(self, service):
|
|
assert service.get_result("unknown") is None
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Shutdown
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestShutdown:
|
|
def test_shutdown_sets_flag(self, service):
|
|
service.shutdown(wait=False)
|
|
assert service._shutdown is True
|
|
|
|
def test_submit_after_shutdown_raises(self, service, mock_cache_manager):
|
|
service.shutdown(wait=False)
|
|
with pytest.raises(RuntimeError, match="shutting down"):
|
|
service.submit_fetch_request(
|
|
sport="nfl", year=2024, url="https://x.com", cache_key="k"
|
|
)
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Cleanup
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestCleanup:
|
|
def test_cleanup_removes_old_requests(self, service):
|
|
old_result = FetchResult(request_id="old", success=True)
|
|
old_result.completed_at = time.time() - 7200 # 2 hours ago
|
|
service.completed_requests["old"] = old_result
|
|
service._last_completed_requests_cleanup = 0 # force cleanup
|
|
removed = service._cleanup_completed_requests(force=True)
|
|
assert removed >= 1
|
|
assert "old" not in service.completed_requests
|
|
|
|
def test_cleanup_respects_interval(self, service):
|
|
old_result = FetchResult(request_id="r", success=True)
|
|
old_result.completed_at = time.time() - 7200
|
|
service.completed_requests["r"] = old_result
|
|
# Cleanup interval not passed, should skip
|
|
service._last_completed_requests_cleanup = time.time()
|
|
removed = service._cleanup_completed_requests(force=False)
|
|
assert removed == 0
|
|
|
|
def test_size_limit_enforcement(self, service):
|
|
service._max_completed_requests = 3
|
|
for i in range(5):
|
|
result = FetchResult(request_id=str(i), success=True)
|
|
result.completed_at = time.time() - (5 - i) * 100 # oldest first
|
|
service.completed_requests[str(i)] = result
|
|
service._last_completed_requests_cleanup = 0
|
|
service._cleanup_completed_requests(force=True)
|
|
assert len(service.completed_requests) <= 3
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Singleton get_background_service
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class TestGetBackgroundService:
|
|
def test_first_call_requires_cache_manager(self):
|
|
with pytest.raises(ValueError, match="cache_manager is required"):
|
|
get_background_service()
|
|
|
|
def test_creates_singleton(self, mock_cache_manager):
|
|
svc1 = get_background_service(mock_cache_manager)
|
|
svc2 = get_background_service()
|
|
assert svc1 is svc2
|
|
|
|
def test_shutdown_clears_singleton(self, mock_cache_manager):
|
|
get_background_service(mock_cache_manager)
|
|
shutdown_background_service()
|
|
with pytest.raises(ValueError):
|
|
get_background_service()
|
|
|
|
|
|
# ---------------------------------------------------------------------------
|
|
# Sport cache keys
|
|
# ---------------------------------------------------------------------------
|
|
|
|
class _FrozenDatetime:
|
|
"""Stands in for the datetime class at a fixed instant. now() without a
|
|
tz answers in a UTC-4 local zone, so a key built from local time shows."""
|
|
|
|
def __init__(self, moment):
|
|
self._moment = moment
|
|
|
|
def now(self, tz=None):
|
|
from datetime import timedelta, timezone
|
|
if tz is None:
|
|
return self._moment.astimezone(timezone(timedelta(hours=-4))).replace(tzinfo=None)
|
|
return self._moment.astimezone(tz)
|
|
|
|
|
|
class TestSportCacheKey:
|
|
"""get_sport_cache_key() must produce CacheManager's key format without
|
|
building a CacheManager (config load + cache-dir probing) to do it."""
|
|
|
|
@pytest.mark.parametrize("sport,date_str", [
|
|
("nfl", "20260922"), ("ncaa_fb", "20251231"), ("soccer", ""),
|
|
])
|
|
def test_explicit_date_matches_cache_manager(self, service, sport, date_str):
|
|
from src.cache_manager import CacheManager
|
|
expected = CacheManager.generate_sport_cache_key(None, sport, date_str)
|
|
assert service.get_sport_cache_key(sport, date_str) == expected
|
|
|
|
def test_default_date_is_today_in_utc_like_cache_manager(self, service):
|
|
from datetime import datetime, timezone
|
|
import src.cache_manager as cm_module
|
|
# 23:30 on the 21st in New York is already the 22nd in UTC.
|
|
frozen = _FrozenDatetime(datetime(2026, 9, 22, 3, 30, tzinfo=timezone.utc))
|
|
with patch.object(bds_module, "datetime", frozen), \
|
|
patch.object(cm_module, "datetime", frozen):
|
|
ours = service.get_sport_cache_key("nba")
|
|
theirs = cm_module.CacheManager.generate_sport_cache_key(None, "nba")
|
|
assert ours == theirs == "nba_20260922"
|
|
|
|
def test_does_not_construct_a_cache_manager(self, service):
|
|
with patch("src.cache_manager.CacheManager.__init__",
|
|
side_effect=AssertionError("CacheManager constructed")):
|
|
assert service.get_sport_cache_key("nhl", "20260101") == "nhl_20260101"
|
|
assert service.get_sport_cache_key("nhl").startswith("nhl_")
|
|
|
|
def test_submit_without_cache_key_looks_up_todays_sport_key(
|
|
self, service, mock_cache_manager):
|
|
mock_cache_manager.get.return_value = {"events": []}
|
|
with patch("src.cache_manager.CacheManager.__init__",
|
|
side_effect=AssertionError("CacheManager constructed")):
|
|
service.submit_fetch_request("mlb", 2026, "http://example.invalid/x")
|
|
key = mock_cache_manager.get.call_args[0][0]
|
|
assert key == service.get_sport_cache_key("mlb")
|
|
|
|
|
|
class TestPriorityIsAcceptedAndIgnored:
|
|
def test_priority_keyword_is_accepted(self, service, mock_cache_manager):
|
|
mock_cache_manager.get.return_value = {"cached": True}
|
|
rid = service.submit_fetch_request(
|
|
"nfl", 2026, "http://example.invalid/x", cache_key="k", priority=5)
|
|
assert service.get_result(rid).cached is True
|