From 4cf6f222edaa3a64c0ccae759d3f65d49ce3b859 Mon Sep 17 00:00:00 2001 From: xiaoxia Date: Mon, 31 Aug 2026 01:36:01 +0800 Subject: [PATCH] =?UTF-8?q?fix(test):=20test=5Fingest=5Fhevc=5Ftranscode?= =?UTF-8?q?=5Ftask=20=E6=A8=A1=E5=9D=97=E7=BA=A7=20mock=20=E7=94=A8?= =?UTF-8?q?=E5=90=8E=E6=B8=85=E7=90=86=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B7=A8?= =?UTF-8?q?=E6=96=87=E4=BB=B6=20mock=20=E6=B1=A1=E6=9F=93=20(#1566)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: xiaoxia Co-committed-by: xiaoxia --- tests/unit/test_ingest_hevc_transcode_task.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/unit/test_ingest_hevc_transcode_task.py b/tests/unit/test_ingest_hevc_transcode_task.py index a02a86bc1..0ccaae476 100644 --- a/tests/unit/test_ingest_hevc_transcode_task.py +++ b/tests/unit/test_ingest_hevc_transcode_task.py @@ -16,6 +16,14 @@ from types import SimpleNamespace from unittest.mock import MagicMock, patch # 在 import worker_app 模块前 mock 掉数据库连接和 celery(同 test_ingest_validation.py) +# 注意:模块级 sys.modules 注入若不撤销,会污染同一 pytest 进程(含 xdist +# worker)后续收集/执行的其他测试文件——它们 from video_processing.xxx +# import 会拿到 MagicMock(表现为 test_thumbnail_generator 纯逻辑用例 +# 断言到 ,50 个用例失败,且与 xdist 分发顺序相关)。 +# 因此在成功 import ingest_mod 之后立即恢复 sys.modules(同 test_dedup_pure.py +# 的做法),mock 对象仍由本文件变量/ingest_mod 引用持有,不影响本文件测试。 +_SAVED_MODULES_KEYS = set(sys.modules.keys()) + _mock_db_module = MagicMock() _mock_db_module.SessionLocal = MagicMock() sys.modules["worker_app.db"] = _mock_db_module @@ -44,6 +52,15 @@ sys.path.insert(0, str(Path(__file__).resolve().parents[2] / "apps" / "worker")) import pytest # noqa: E402 from worker_app.tasks import ingest as ingest_mod # noqa: E402 +# ── 立即恢复 sys.modules,避免 mock 泄漏到其他测试文件 ── +for _key in list(sys.modules.keys()): + if _key not in _SAVED_MODULES_KEYS: + # 保留 mock 对象供本文件 patch.object 使用 + if _key in ("video_processing.oss_helpers", "video_processing.thumbnail_generator"): + continue + del sys.modules[_key] +del _SAVED_MODULES_KEYS + class _FakeJobRepo: def __init__(self, db):