From 648a3ceb9aae1f03dfb11db5f255a248c9bf8b6e Mon Sep 17 00:00:00 2001 From: HACK-WU <89595754+HACK-WU@users.noreply.github.com> Date: Wed, 13 Nov 2024 17:04:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=94=A8=E4=BE=8B=E8=B7=9F=E8=BF=9B=20--stor?= =?UTF-8?q?y=3D120579512=20(#3814)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tests/service/fta_action/test_notice_by_fakees.py | 2 +- .../tests/service/fta_action/test_notice_execute.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_by_fakees.py b/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_by_fakees.py index 20f2adb7a3..123e3174d9 100644 --- a/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_by_fakees.py +++ b/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_by_fakees.py @@ -84,7 +84,7 @@ def test_job_with_appointees(self): { "duty_rule_id": 1, "start_time": time_tools.datetime2str(datetime.now(tz=local_timezone)), - "finished_time": "", + "finished_time": time_tools.datetime2str(datetime.now(tz=local_timezone) + timedelta(hours=1)), "is_effective": 1, "order": 2, "work_times": [{'start_time': today_begin, 'end_time': today_end}], diff --git a/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_execute.py b/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_execute.py index 51619fc42e..48a07089a4 100644 --- a/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_execute.py +++ b/bkmonitor/alarm_backends/tests/service/fta_action/test_notice_execute.py @@ -500,7 +500,6 @@ def get_strategy_dict(group_id): "notice": { # 通知设置 "id": 1, "config_id": 55555, # 套餐ID,如果不选套餐请置为0 - # 'relation_id': 12345, "user_groups": [group_id], # 告警组ID "signal": ["abnormal", "recovered", "ack"], # 触发信号,abnormal-异常,recovered-恢复,closed-关闭,execute-执行动作时, execute_success-执行成功, execute_failed-执行失败