From 712eab5ed0a1eb62885d205ffb068358288c3ff7 Mon Sep 17 00:00:00 2001
From: zhanhuasheng <zhanhuasheng@channelwill.cn>
Date: Wed, 22 May 2024 16:01:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=9C=E5=BA=95=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 TestData/setting/macro_test_data.py      |  3 +++
 TestFile/setting/macro/macro_select.py   | 10 +++++-----
 TestFile/setting/team/teammate_delete.py |  5 +++++
 YamlCase/setting/team.yaml               |  1 +
 4 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 TestFile/setting/team/teammate_delete.py

diff --git a/TestData/setting/macro_test_data.py b/TestData/setting/macro_test_data.py
index 2b6694e..9160b52 100644
--- a/TestData/setting/macro_test_data.py
+++ b/TestData/setting/macro_test_data.py
@@ -1,4 +1,6 @@
 from Utils.global_variate import Global
+from Utils.sql_handler import SqlHandler
+from Utils.config_handler import base_config
 
 class macroData(Global):
     append_macro_perm_type = 1
@@ -9,4 +11,5 @@ class macroData(Global):
     update_macro_title = 'autotest_macro2'
     macro_content_update = 'new_update_macro_content'
     update_macro_content = r'{\"contentList\":\"%s\\n\",\"attachmentList\":[]}'%macro_content_update
+    macro_db = SqlHandler(address=base_config.get_value('mysql','address'),port=int(base_config.get_value('mysql','port')),account=base_config.get_value('mysql','account'),password=base_config.get_value('mysql','password'))
 
diff --git a/TestFile/setting/macro/macro_select.py b/TestFile/setting/macro/macro_select.py
index c537014..3896649 100644
--- a/TestFile/setting/macro/macro_select.py
+++ b/TestFile/setting/macro/macro_select.py
@@ -1,13 +1,12 @@
-from Utils.sql_handler import test_env_conn
 from TestData.setting.macro_test_data import macroData
 from Utils.mockData_handler import data_handler
 
 macro_select_sql = f'select * from `macro` where brand_id = {macroData.brandId} and deleted_at is NULL'
-macro_select_result = test_env_conn.select_many_value(sql=macro_select_sql)
+macro_select_result = macroData.macro_db.select_many_value(sql=macro_select_sql)
 if macro_select_result:
     macro_id_list = tuple([i['macro_id'] for i in macro_select_result])
     macro_num_select_sql = f'select * from `macro_permission` where macro_id in {macro_id_list}'
-    macro_num_select_result = test_env_conn.select_many_value(sql=macro_num_select_sql)
+    macro_num_select_result = macroData.macro_db.select_many_value(sql=macro_num_select_sql)
     team_macro_num = 0
     brand_macro_num = 0
     user_macro_num = 0
@@ -38,7 +37,7 @@ else:
     macro_insert_sql = f'''INSERT INTO `macro` (macro_id,title,content,sorts,clicks,brand_id,create_by_name,create_by_uid,deleted_at,update_at,create_at) VALUES
 	 ('{append_macro_id}','{macroData.append_macro_title}','{macroData.append_macro_content}',1,0,{macroData.brandId},'{macroData.userName}',{macroData.userId},NULL,'2024-04-23 14:54:31','2024-04-23 14:54:31');
 '''
-    test_env_conn.execute_sql(sql=macro_insert_sql)
+    macroData.macro_db.execute_sql(sql=macro_insert_sql)
     setattr(macroData,'brand_macro_num',1)
     setattr(macroData,'team_macro_num',0)
     setattr(macroData,'user_macro_num',0)
@@ -58,4 +57,5 @@ setattr(macroData,'macro_sorts',macro_sorts)
 setattr(macroData,'macro_clicks',macro_clicks)
 setattr(macroData,'macro_brand_id',macro_brand_id)
 setattr(macroData,'macro_create_by_name',macro_create_by_name)
-setattr(macroData,'macro_create_by_id',macro_create_by_id)
\ No newline at end of file
+setattr(macroData,'macro_create_by_id',macro_create_by_id)
+macroData.macro_db.close_db()
\ No newline at end of file
diff --git a/TestFile/setting/team/teammate_delete.py b/TestFile/setting/team/teammate_delete.py
new file mode 100644
index 0000000..6253db3
--- /dev/null
+++ b/TestFile/setting/team/teammate_delete.py
@@ -0,0 +1,5 @@
+from Utils.sql_handler import test_env_conn
+from TestData.setting.team_test_data import teamData
+
+teammate_delete_sql = f'delete from `customer_service` where email like "autotest_customer%"'
+test_env_conn.execute_sql(sql=teammate_delete_sql)
\ No newline at end of file
diff --git a/YamlCase/setting/team.yaml b/YamlCase/setting/team.yaml
index 33f002c..d77f779 100644
--- a/YamlCase/setting/team.yaml
+++ b/YamlCase/setting/team.yaml
@@ -171,6 +171,7 @@ api18:
   title: 检查是否删除团队成员成功
   url: /api/v1/customerService/listCustomerService
   method: post
+  after_sql: setting/team/teammate_delete.py
   data: {"isActivation":-1,"isDelete":0,"v":"${v}"}
   expected:
     - eq: {"$.code": 0}
-- 
GitLab