mirror of
https://github.com/unshackle-dl/unshackle.git
synced 2026-11-17 22:45:06 +00:00
test(services): use placeholder tags instead of real service names
This commit is contained in:
@@ -23,7 +23,7 @@ pytestmark = pytest.mark.unit
|
||||
|
||||
def test_redact_parameters_masks_secrets_and_proxy_userinfo():
|
||||
params = {
|
||||
"service": "ATV",
|
||||
"service": "EXAMPLE",
|
||||
"credential": "user:hunter2",
|
||||
"password": "pw",
|
||||
"token": "tok",
|
||||
@@ -70,7 +70,7 @@ def test_to_dict_full_details_redacts_error_fields_and_parameters():
|
||||
job_id="j1",
|
||||
status=JobStatus.FAILED,
|
||||
created_time=datetime(2026, 1, 1),
|
||||
service="ATV",
|
||||
service="EXAMPLE",
|
||||
title_id="t",
|
||||
parameters={"credential": "user:hunter2"},
|
||||
)
|
||||
@@ -102,35 +102,37 @@ def stub_handler(monkeypatch):
|
||||
async def test_cdm_override_forbidden_by_default(stub_handler):
|
||||
stub_handler.setattr(handlers.config, "serve", {})
|
||||
with pytest.raises(APIError) as ei:
|
||||
await handlers.download_handler({"service": "ATV", "title_id": "t", "cdm": "dev"})
|
||||
await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "cdm": "dev"})
|
||||
assert ei.value.error_code == APIErrorCode.FORBIDDEN
|
||||
|
||||
|
||||
async def test_cdm_override_allowed_when_enabled(stub_handler):
|
||||
stub_handler.setattr(handlers.config, "serve", {"cdm_overrides": True})
|
||||
# passing the gate reaches the stubbed Services.load, whose error is caught and returned as a response
|
||||
resp = await handlers.download_handler({"service": "ATV", "title_id": "t", "cdm": "dev"})
|
||||
resp = await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "cdm": "dev"})
|
||||
assert isinstance(resp, web.Response)
|
||||
|
||||
|
||||
async def test_cdm_override_allowlist_permits_only_named_device(stub_handler):
|
||||
stub_handler.setattr(handlers.config, "serve", {"cdm_overrides": ["good"]})
|
||||
assert isinstance(await handlers.download_handler({"service": "ATV", "title_id": "t", "cdm": "good"}), web.Response)
|
||||
assert isinstance(
|
||||
await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "cdm": "good"}), web.Response
|
||||
)
|
||||
with pytest.raises(APIError) as ei:
|
||||
await handlers.download_handler({"service": "ATV", "title_id": "t", "cdm": "other"})
|
||||
await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "cdm": "other"})
|
||||
assert ei.value.error_code == APIErrorCode.FORBIDDEN
|
||||
|
||||
|
||||
async def test_credential_forbidden_by_default(stub_handler):
|
||||
stub_handler.setattr(handlers.config, "serve", {})
|
||||
with pytest.raises(APIError) as ei:
|
||||
await handlers.download_handler({"service": "ATV", "title_id": "t", "credential": "u:p"})
|
||||
await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "credential": "u:p"})
|
||||
assert ei.value.error_code == APIErrorCode.FORBIDDEN
|
||||
|
||||
|
||||
async def test_credential_allowed_when_enabled(stub_handler):
|
||||
stub_handler.setattr(handlers.config, "serve", {"allow_job_credentials": True})
|
||||
resp = await handlers.download_handler({"service": "ATV", "title_id": "t", "credential": "u:p"})
|
||||
resp = await handlers.download_handler({"service": "EXAMPLE", "title_id": "t", "credential": "u:p"})
|
||||
assert isinstance(resp, web.Response)
|
||||
|
||||
|
||||
|
||||
@@ -23,17 +23,17 @@ def manager() -> DownloadQueueManager:
|
||||
|
||||
|
||||
def test_create_job_returns_queued_job(manager: DownloadQueueManager) -> None:
|
||||
job = manager.create_job("ATV", "movie-123", profile="default")
|
||||
job = manager.create_job("EXAMPLE", "movie-123", profile="default")
|
||||
assert isinstance(job, DownloadJob)
|
||||
assert job.status is JobStatus.QUEUED
|
||||
assert job.service == "ATV"
|
||||
assert job.service == "EXAMPLE"
|
||||
assert job.title_id == "movie-123"
|
||||
assert job.parameters == {"profile": "default"}
|
||||
|
||||
|
||||
def test_get_and_list_jobs(manager: DownloadQueueManager) -> None:
|
||||
a = manager.create_job("ATV", "a")
|
||||
b = manager.create_job("NF", "b")
|
||||
a = manager.create_job("EXAMPLE", "a")
|
||||
b = manager.create_job("DEMO", "b")
|
||||
assert manager.get_job(a.job_id) is a
|
||||
assert manager.get_job("missing") is None
|
||||
listed = manager.list_jobs()
|
||||
@@ -41,11 +41,11 @@ def test_get_and_list_jobs(manager: DownloadQueueManager) -> None:
|
||||
|
||||
|
||||
def test_to_dict_short_vs_full(manager: DownloadQueueManager) -> None:
|
||||
job = manager.create_job("ATV", "t", profile="p")
|
||||
job = manager.create_job("EXAMPLE", "t", profile="p")
|
||||
short = job.to_dict()
|
||||
assert "parameters" not in short
|
||||
assert short["status"] == "queued"
|
||||
assert short["service"] == "ATV"
|
||||
assert short["service"] == "EXAMPLE"
|
||||
full = job.to_dict(include_full_details=True)
|
||||
assert full["parameters"] == {"profile": "p"}
|
||||
assert "error_message" in full
|
||||
@@ -53,7 +53,7 @@ def test_to_dict_short_vs_full(manager: DownloadQueueManager) -> None:
|
||||
|
||||
|
||||
def test_cancel_queued_job_sets_cancelled_and_signals_event(manager: DownloadQueueManager) -> None:
|
||||
job = manager.create_job("ATV", "t")
|
||||
job = manager.create_job("EXAMPLE", "t")
|
||||
assert manager.cancel_job(job.job_id) is True
|
||||
assert job.status is JobStatus.CANCELLED
|
||||
assert job.cancel_event.is_set()
|
||||
@@ -64,13 +64,13 @@ def test_cancel_unknown_job_returns_false(manager: DownloadQueueManager) -> None
|
||||
|
||||
|
||||
def test_cancel_completed_job_returns_false(manager: DownloadQueueManager) -> None:
|
||||
job = manager.create_job("ATV", "t")
|
||||
job = manager.create_job("EXAMPLE", "t")
|
||||
job.status = JobStatus.COMPLETED
|
||||
assert manager.cancel_job(job.job_id) is False
|
||||
|
||||
|
||||
def test_cancel_downloading_job_signals(manager: DownloadQueueManager) -> None:
|
||||
job = manager.create_job("ATV", "t")
|
||||
job = manager.create_job("EXAMPLE", "t")
|
||||
job.status = JobStatus.DOWNLOADING
|
||||
assert manager.cancel_job(job.job_id) is True
|
||||
assert job.status is JobStatus.CANCELLED
|
||||
@@ -80,10 +80,10 @@ def test_cancel_downloading_job_signals(manager: DownloadQueueManager) -> None:
|
||||
def test_cleanup_old_jobs_drops_old_terminal_states(manager: DownloadQueueManager) -> None:
|
||||
now = datetime.now()
|
||||
old = now - timedelta(hours=48)
|
||||
keep_recent = manager.create_job("ATV", "recent")
|
||||
drop_old_done = manager.create_job("ATV", "old-done")
|
||||
drop_old_failed = manager.create_job("ATV", "old-failed")
|
||||
keep_running = manager.create_job("ATV", "running")
|
||||
keep_recent = manager.create_job("EXAMPLE", "recent")
|
||||
drop_old_done = manager.create_job("EXAMPLE", "old-done")
|
||||
drop_old_failed = manager.create_job("EXAMPLE", "old-failed")
|
||||
keep_running = manager.create_job("EXAMPLE", "running")
|
||||
|
||||
keep_recent.status = JobStatus.COMPLETED
|
||||
keep_recent.completed_time = now
|
||||
|
||||
@@ -118,9 +118,9 @@ def test_build_error_response_debug_mode_includes_traceback() -> None:
|
||||
],
|
||||
)
|
||||
def test_categorize_exception(exc: Exception, expected_code: APIErrorCode) -> None:
|
||||
api_err = categorize_exception(exc, context={"service": "ATV"})
|
||||
api_err = categorize_exception(exc, context={"service": "EXAMPLE"})
|
||||
assert api_err.error_code == expected_code
|
||||
assert api_err.details.get("service") == "ATV"
|
||||
assert api_err.details.get("service") == "EXAMPLE"
|
||||
|
||||
|
||||
def test_categorize_preserves_context() -> None:
|
||||
|
||||
@@ -55,9 +55,9 @@ def test_post_sends_json_body(client: RemoteClient) -> None:
|
||||
responses.add_callback(
|
||||
responses.POST, "http://srv:8786/api/session/create", callback=cb, content_type="application/json"
|
||||
)
|
||||
result = client.post("/api/session/create", {"service": "ATV"})
|
||||
result = client.post("/api/session/create", {"service": "EXAMPLE"})
|
||||
assert result == {"session_id": "abc"}
|
||||
assert captured["body"] == {"service": "ATV"}
|
||||
assert captured["body"] == {"service": "EXAMPLE"}
|
||||
|
||||
|
||||
@responses.activate
|
||||
|
||||
@@ -10,8 +10,14 @@ import pytest
|
||||
from unshackle.core.services import Services
|
||||
|
||||
SERVED = [
|
||||
{"tag": "AMZN", "url": "https://example.com", "help": "Amazon.", "cli_params": [], "aliases": []},
|
||||
{"tag": "HMAX", "url": "https://example.com", "help": "Max.", "cli_params": [], "aliases": ["MAX", "hbomax"]},
|
||||
{"tag": "EXAMPLE", "url": "https://example.com", "help": "Example service.", "cli_params": [], "aliases": []},
|
||||
{
|
||||
"tag": "DEMO",
|
||||
"url": "https://example.com",
|
||||
"help": "Demo service.",
|
||||
"cli_params": [],
|
||||
"aliases": ["ALT", "alt-demo"],
|
||||
},
|
||||
]
|
||||
|
||||
|
||||
@@ -21,31 +27,31 @@ def _make(name: str) -> click.Command:
|
||||
|
||||
def test_unknown_name_raises_with_typed_name_and_available_list() -> None:
|
||||
with patch.object(Services, "fetch_remote_services", return_value=SERVED):
|
||||
with pytest.raises(click.ClickException, match=r"does not offer a service named 'BBC'.*AMZN, HMAX"):
|
||||
_make("BBC")
|
||||
with pytest.raises(click.ClickException, match=r"does not offer a service named 'NOPE'.*DEMO, EXAMPLE"):
|
||||
_make("NOPE")
|
||||
|
||||
|
||||
def test_served_tag_builds_full_command() -> None:
|
||||
with patch.object(Services, "fetch_remote_services", return_value=SERVED):
|
||||
cmd = _make("AMZN")
|
||||
assert cmd.help == "Amazon."
|
||||
cmd = _make("EXAMPLE")
|
||||
assert cmd.help == "Example service."
|
||||
|
||||
|
||||
def test_server_alias_resolves_to_server_tag() -> None:
|
||||
with patch.object(Services, "fetch_remote_services", return_value=SERVED):
|
||||
cmd = _make("max")
|
||||
assert cmd.name == "HMAX"
|
||||
assert cmd.help == "Max."
|
||||
cmd = _make("alt")
|
||||
assert cmd.name == "DEMO"
|
||||
assert cmd.help == "Demo service."
|
||||
|
||||
|
||||
def test_empty_service_list_raises_no_services_message() -> None:
|
||||
with patch.object(Services, "fetch_remote_services", return_value=[]):
|
||||
with pytest.raises(click.ClickException, match=r"offers no services to your API key"):
|
||||
_make("AMZN")
|
||||
_make("EXAMPLE")
|
||||
|
||||
|
||||
def test_fetch_failure_keeps_stub_instead_of_raising() -> None:
|
||||
with patch.object(Services, "fetch_remote_services", return_value=None):
|
||||
cmd = _make("AMZN")
|
||||
assert cmd.name == "AMZN"
|
||||
cmd = _make("EXAMPLE")
|
||||
assert cmd.name == "EXAMPLE"
|
||||
assert cmd.help is None
|
||||
|
||||
@@ -28,7 +28,7 @@ def single_remote_service(monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
"primary": {
|
||||
"url": "https://primary:8080",
|
||||
"api_key": "key-abc",
|
||||
"services": {"ATV": True, "NF": True},
|
||||
"services": {"EXAMPLE": True, "DEMO": True},
|
||||
"server_cdm": True,
|
||||
}
|
||||
},
|
||||
@@ -97,7 +97,7 @@ def test_resolve_server_single_picks_only_entry(single_remote_service) -> None:
|
||||
assert url == "https://primary:8080"
|
||||
assert key == "key-abc"
|
||||
assert services["_server_cdm"] is True
|
||||
assert services.get("ATV") is True
|
||||
assert services.get("EXAMPLE") is True
|
||||
|
||||
|
||||
def test_resolve_server_explicit_name(single_remote_service) -> None:
|
||||
|
||||
@@ -182,7 +182,7 @@ def test_match_track_no_candidates_returns_none() -> None:
|
||||
|
||||
def test_build_title_movie() -> None:
|
||||
info = {"type": "movie", "id": "movie-0001", "name": "Foo", "year": 2024, "language": "en"}
|
||||
title = build_title(info, "ATV", "fallback")
|
||||
title = build_title(info, "EXAMPLE", "fallback")
|
||||
assert isinstance(title, Movie)
|
||||
assert title.id == "movie-0001"
|
||||
assert title.name == "Foo"
|
||||
@@ -199,7 +199,7 @@ def test_build_title_episode() -> None:
|
||||
"year": 2024,
|
||||
"language": "en",
|
||||
}
|
||||
title = build_title(info, "ATV", "fallback")
|
||||
title = build_title(info, "EXAMPLE", "fallback")
|
||||
assert isinstance(title, Episode)
|
||||
assert title.season == 1
|
||||
assert title.number == 2
|
||||
@@ -207,7 +207,7 @@ def test_build_title_episode() -> None:
|
||||
|
||||
|
||||
def test_build_title_falls_back_to_id_when_missing() -> None:
|
||||
title = build_title({"type": "movie", "name": "x"}, "ATV", "fallback-id")
|
||||
title = build_title({"type": "movie", "name": "x"}, "EXAMPLE", "fallback-id")
|
||||
assert title.id == "fallback-id"
|
||||
|
||||
|
||||
|
||||
@@ -25,15 +25,15 @@ def store() -> SessionStore:
|
||||
|
||||
|
||||
async def test_create_returns_entry_with_uuid(store: SessionStore) -> None:
|
||||
entry = await store.create("ATV", _FakeService())
|
||||
entry = await store.create("EXAMPLE", _FakeService())
|
||||
assert isinstance(entry, SessionEntry)
|
||||
assert entry.service_tag == "ATV"
|
||||
assert entry.service_tag == "EXAMPLE"
|
||||
assert entry.session_id and len(entry.session_id) >= 32
|
||||
assert store.session_count == 1
|
||||
|
||||
|
||||
async def test_create_with_explicit_session_id(store: SessionStore) -> None:
|
||||
entry = await store.create("NF", _FakeService(), session_id="fixed-id")
|
||||
entry = await store.create("DEMO", _FakeService(), session_id="fixed-id")
|
||||
assert entry.session_id == "fixed-id"
|
||||
|
||||
|
||||
@@ -42,7 +42,7 @@ async def test_get_returns_none_for_missing(store: SessionStore) -> None:
|
||||
|
||||
|
||||
async def test_get_touches_last_accessed(store: SessionStore) -> None:
|
||||
entry = await store.create("DSNP", _FakeService())
|
||||
entry = await store.create("DEMO", _FakeService())
|
||||
before = entry.last_accessed
|
||||
await asyncio.sleep(0.01)
|
||||
fetched = await store.get(entry.session_id)
|
||||
@@ -68,7 +68,7 @@ async def test_delete_returns_false_when_missing(store: SessionStore) -> None:
|
||||
async def test_cleanup_expired_drops_old_authenticated(store: SessionStore, monkeypatch: pytest.MonkeyPatch) -> None:
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
entry = await store.create("ATV", _FakeService())
|
||||
entry = await store.create("EXAMPLE", _FakeService())
|
||||
entry.last_accessed = datetime.now(timezone.utc) - timedelta(seconds=store.ttl + 100)
|
||||
removed = await store.cleanup_expired()
|
||||
assert removed == 1
|
||||
@@ -77,7 +77,7 @@ async def test_cleanup_expired_drops_old_authenticated(store: SessionStore, monk
|
||||
|
||||
async def test_cleanup_expired_keeps_pending_input_under_grace(store: SessionStore) -> None:
|
||||
"""Sessions awaiting user input get a longer grace period (10 min) than authenticated TTL."""
|
||||
entry = await store.create("ATV", _FakeService())
|
||||
entry = await store.create("EXAMPLE", _FakeService())
|
||||
entry.input_bridge = InputBridge()
|
||||
entry.auth_status = AuthStatus.PENDING_INPUT
|
||||
removed = await store.cleanup_expired()
|
||||
@@ -91,7 +91,7 @@ async def test_cleanup_expired_drops_pending_input_past_grace(store: SessionStor
|
||||
|
||||
from unshackle.core.api.input_bridge import AUTH_INPUT_TIMEOUT
|
||||
|
||||
entry = await store.create("ATV", _FakeService())
|
||||
entry = await store.create("EXAMPLE", _FakeService())
|
||||
entry.input_bridge = InputBridge()
|
||||
entry.auth_status = AuthStatus.PENDING_INPUT
|
||||
entry.last_accessed = datetime.now(timezone.utc) - timedelta(seconds=AUTH_INPUT_TIMEOUT + 1)
|
||||
@@ -101,8 +101,8 @@ async def test_cleanup_expired_drops_pending_input_past_grace(store: SessionStor
|
||||
|
||||
|
||||
async def test_cancel_all_bridges(store: SessionStore) -> None:
|
||||
a = await store.create("ATV", _FakeService())
|
||||
b = await store.create("NF", _FakeService())
|
||||
a = await store.create("EXAMPLE", _FakeService())
|
||||
b = await store.create("DEMO", _FakeService())
|
||||
a.input_bridge = InputBridge()
|
||||
b.input_bridge = InputBridge()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user