From 3f68f431aa613cd11a2f25d413859d4a74853663 Mon Sep 17 00:00:00 2001
From: yanta <hai.yang@sayweee.com>
Date: Mon, 23 Sep 2024 11:46:00 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=9D=E8=AF=95=E4=BF=AE=E6=94=B9=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sql/test_archiver.py | 33 +++++++++++++++++++--------------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/sql/test_archiver.py b/sql/test_archiver.py
index 419d337253..7947f01513 100644
--- a/sql/test_archiver.py
+++ b/sql/test_archiver.py
@@ -16,9 +16,10 @@
     ArchiveConfig,
     WorkflowAudit,
     WorkflowAuditSetting,
+    WorkflowAuditDetail,
 )
 from sql.tests import User
-
+from datetime import timedelta, datetime
 
 class TestArchiver(TestCase):
     """
@@ -79,6 +80,13 @@ def setUp(self):
             create_user="",
             create_user_display="",
         )
+        self.audit_detail = WorkflowAuditDetail.objects.create(
+            audit_id=self.audit_flow.id,
+            audit_user="",
+            audit_time= self.now - timedelta(days=1),
+            audit_status=WorkflowStatus.PASSED,
+            remark="",
+        )
         self.sys_config = SysConfig()
         self.client = Client()
 
@@ -248,8 +256,8 @@ def test_archive_apply_auto_pass(self, mock_generate_setting):
         assert archive_config.status == WorkflowStatus.PASSED
 
     @patch("sql.utils.workflow_audit.AuditV2.operate")
-    @patch("sql.archiver.async_task")
-    def test_archive_audit(self, _async_task, mock_operate):
+    @patch("sql.notify.notify_for_audit.apply_async")
+    def test_archive_audit(self, mock_apply_async, mock_operate):
         """
         测试审核归档实例数据
         :return:
@@ -257,8 +265,8 @@ def test_archive_audit(self, _async_task, mock_operate):
         mock_operate.return_value = None
         data = {
             "archive_id": self.archive_apply.id,
-            "audit_status": WorkflowStatus.PASSED,
-            "audit_remark": "xxxx",
+            "audit_status": self.audit_detail.audit_status,
+            "audit_remark": self.audit_detail.remark,
         }
         # operate 被 patch 了, 这里强制设置一下, 走一下流程
         self.audit_flow.current_status = WorkflowStatus.PASSED
@@ -272,16 +280,13 @@ def test_archive_audit(self, _async_task, mock_operate):
         assert self.archive_apply.state == True
         assert self.archive_apply.status == WorkflowStatus.PASSED
 
-    @patch("sql.archiver.async_task")
-    def test_add_archive_task(self, _async_task):
-        """
-        测试添加异步归档任务
-        :return:
-        """
-        add_archive_task()
+    @patch('sql.archiver.add_archive_task.apply_async')
+    def test_add_archive_task(self, mock_apply_async):
+        # 调用 add.apply_async
+        add_archive_task.apply_async()
 
-    @patch("sql.archiver.async_task")
-    def test_add_archive(self, _async_task):
+    @patch("sql.archiver.archive.apply_async")
+    def test_add_archive(self, mock_apply_async):
         """
         测试执行归档任务
         :return: