From e1aff5609d0b6916595a5b6c491e352adff5bd18 Mon Sep 17 00:00:00 2001 From: CI Bot Date: Sun, 6 Sep 2026 05:33:55 +0000 Subject: [PATCH] style: auto-format with black + isort + prettier [skip ci-format-check] --- tests/unit/test_cleanup_ingest_beat_1714.py | 46 +++++++++++-------- tests/unit/test_ingest_orphan_cleanup_1714.py | 4 +- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/tests/unit/test_cleanup_ingest_beat_1714.py b/tests/unit/test_cleanup_ingest_beat_1714.py index a33bdb181..f7c5bf11d 100644 --- a/tests/unit/test_cleanup_ingest_beat_1714.py +++ b/tests/unit/test_cleanup_ingest_beat_1714.py @@ -25,16 +25,21 @@ def test_beat_cleanup_calls_core_and_revokes(): """beat 任务串联三个核心步骤,返回汇总计数。""" fake_session = MagicMock() - with patch("worker_app.db.SessionLocal", return_value=fake_session) as m_db, patch( - "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs", - return_value=([("job-1", "cel-1"), ("job-2", "")], ["a-1"]), - ) as m_jobs, patch( - "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets", - return_value=["a-2"], - ) as m_assets, patch( - "packages.shared.celery_orphan_guard.revoke_and_purge", - return_value=1, - ) as m_revoke: + with ( + patch("worker_app.db.SessionLocal", return_value=fake_session) as m_db, + patch( + "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs", + return_value=([("job-1", "cel-1"), ("job-2", "")], ["a-1"]), + ) as m_jobs, + patch( + "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets", + return_value=["a-2"], + ) as m_assets, + patch( + "packages.shared.celery_orphan_guard.revoke_and_purge", + return_value=1, + ) as m_revoke, + ): result = cleanup.scheduled_cleanup_stale_ingest_jobs() m_db.assert_called_once() @@ -52,15 +57,18 @@ def test_beat_cleanup_no_op_when_nothing_stale(): """无孤儿时不调 revoke,返回全 0。""" fake_session = MagicMock() - with patch("worker_app.db.SessionLocal", return_value=fake_session), patch( - "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs", - return_value=([], []), - ), patch( - "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets", - return_value=[], - ), patch( - "packages.shared.celery_orphan_guard.revoke_and_purge" - ) as m_revoke: + with ( + patch("worker_app.db.SessionLocal", return_value=fake_session), + patch( + "packages.application.ingest_orphan_cleanup.cleanup_stale_ingest_jobs", + return_value=([], []), + ), + patch( + "packages.application.ingest_orphan_cleanup.cleanup_orphan_processing_assets", + return_value=[], + ), + patch("packages.shared.celery_orphan_guard.revoke_and_purge") as m_revoke, + ): result = cleanup.scheduled_cleanup_stale_ingest_jobs() m_revoke.assert_not_called() diff --git a/tests/unit/test_ingest_orphan_cleanup_1714.py b/tests/unit/test_ingest_orphan_cleanup_1714.py index 8c97b2e99..cceccf8d4 100644 --- a/tests/unit/test_ingest_orphan_cleanup_1714.py +++ b/tests/unit/test_ingest_orphan_cleanup_1714.py @@ -184,10 +184,10 @@ class TestCleanupOrphanProcessingAssets: class TestRecoverStuckIngestJobsOnStartup: def test_stuck_processing_job_requeued(self, session): """processing 超 10 分钟 → 重置 pending 并重新 send_task,回写新 celery id。""" - from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup - from types import SimpleNamespace + from packages.application.ingest_orphan_cleanup import recover_stuck_ingest_jobs_on_startup + job = _mk_job(session, status="processing", celery_task_id="old-cel-1", asset_id="a-1", minutes_ago=30) sent = []