diff --git a/shelfmark/core/queue.py b/shelfmark/core/queue.py index 293a58b1..8567c8d6 100644 --- a/shelfmark/core/queue.py +++ b/shelfmark/core/queue.py @@ -152,6 +152,15 @@ class BookQueue: hook: Callable[[str, QueueStatus, DownloadTask], None] | None = None hook_task: DownloadTask | None = None previous_status = self._status.get(book_id) + if ( + previous_status in TERMINAL_QUEUE_STATUSES + and status in TERMINAL_QUEUE_STATUSES + and previous_status != status + ): + # The first terminal status wins. A worker that checked its cancel flag just before + # a cancel landed would otherwise overwrite CANCELLED with COMPLETE and fire the + # terminal hook a second time. + return None, None self._update_status(book_id, status) if ( diff --git a/tests/core/test_queue.py b/tests/core/test_queue.py index 6320ce1d..8ef9c661 100644 --- a/tests/core/test_queue.py +++ b/tests/core/test_queue.py @@ -1,6 +1,5 @@ """Tests for queue hook failure handling and cancellation.""" -import threading from unittest.mock import patch from shelfmark.core.models import DownloadTask, QueueStatus @@ -54,41 +53,56 @@ def test_enqueue_existing_logs_queue_hook_failures(): assert str(args[2]) == "boom" -def test_cancel_does_not_overwrite_a_download_that_finished_first(): - """A download that completes while a cancel is in flight must stay complete.""" - queue = BookQueue() - assert queue.add(_make_task("race-task")) is True +def _downloading_task(queue: BookQueue, task_id: str) -> list[QueueStatus]: + """Put a task in DOWNLOADING and return the list its terminal hook appends to.""" + assert queue.add(_make_task(task_id)) is True assert queue.get_next() is not None - queue.update_status("race-task", QueueStatus.DOWNLOADING) + queue.update_status(task_id, QueueStatus.DOWNLOADING) terminal_events: list[QueueStatus] = [] queue.set_terminal_status_hook(lambda _task_id, status, _task: terminal_events.append(status)) + return terminal_events - original_update_status = queue.update_status - cancel_yielded = threading.Event() - worker_finished = threading.Event() - def update_status_yielding_to_the_worker(task_id: str, status: QueueStatus) -> None: - # Hand the worker the queue whenever the cancel path lets go of it before writing. - if status == QueueStatus.CANCELLED: - cancel_yielded.set() - worker_finished.wait(timeout=5) - original_update_status(task_id, status) +def test_cancel_does_not_overwrite_a_download_that_finished_first(): + """A cancel that arrives after the download completed is refused and changes nothing.""" + queue = BookQueue() + terminal_events = _downloading_task(queue, "race-task") - queue.update_status = update_status_yielding_to_the_worker # type: ignore[method-assign] - - def finish_download() -> None: - cancel_yielded.wait(timeout=5) - original_update_status("race-task", QueueStatus.COMPLETE) - worker_finished.set() - - worker = threading.Thread(target=finish_download, daemon=True, name="TestDownloadWorker") - worker.start() - try: - queue.cancel_download("race-task") - finally: - cancel_yielded.set() - worker.join(timeout=5) + queue.update_status("race-task", QueueStatus.COMPLETE) + assert queue.cancel_download("race-task") is False assert queue.get_task_status("race-task") == QueueStatus.COMPLETE - assert terminal_events[-1] == QueueStatus.COMPLETE + assert terminal_events == [QueueStatus.COMPLETE] + + +def test_a_late_complete_does_not_overwrite_a_cancel(): + """The worker checks its cancel flag and then writes COMPLETE; a cancel in between wins.""" + queue = BookQueue() + terminal_events = _downloading_task(queue, "race-task") + + assert queue.cancel_download("race-task") is True + queue.update_status("race-task", QueueStatus.COMPLETE) + + assert queue.get_task_status("race-task") == QueueStatus.CANCELLED + assert terminal_events == [QueueStatus.CANCELLED] + + +def test_a_task_that_ended_in_error_is_not_completed_afterwards(): + queue = BookQueue() + terminal_events = _downloading_task(queue, "race-task") + + queue.update_status("race-task", QueueStatus.ERROR) + queue.update_status("race-task", QueueStatus.COMPLETE) + + assert queue.get_task_status("race-task") == QueueStatus.ERROR + assert terminal_events == [QueueStatus.ERROR] + + +def test_a_terminal_task_can_still_be_requeued(): + queue = BookQueue() + _downloading_task(queue, "race-task") + queue.update_status("race-task", QueueStatus.ERROR) + + assert queue.enqueue_existing("race-task") is True + assert queue.get_task_status("race-task") == QueueStatus.QUEUED