diff --git a/TestData/setting/macro_test_data.py b/TestData/setting/macro_test_data.py index 2b6694e927f0d63a648d08be0755d754f9dc419a..9160b52a5a28626e1474f5840ff7c8a614a4a14f 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 c537014f4dbb41adb0d58f74047104043832f6d3..38966499381d13dfeb0474478f2528d5a8d754bb 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 0000000000000000000000000000000000000000..6253db385f56ae3f825186c19925cc994b23467c --- /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 33f002c6353084ce8c0148b04413cf7378b30c8c..d77f779c70c58ecbd302db749b25151aa1971d06 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}