From 6e9de43db8828354320118339c1bde3deaef6d84 Mon Sep 17 00:00:00 2001 From: zhanhuasheng Date: Mon, 13 May 2024 14:43:07 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=96=B0=E5=A2=9E=E7=94=A8=E4=BE=8B?= =?UTF-8?q?=202=E3=80=81=E6=96=B0=E5=A2=9E=E8=B6=85=E6=97=B6=E7=9D=A1?= =?UTF-8?q?=E7=9C=A0=E6=9C=BA=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TestCase/setting/test_09_tag.py | 18 +++++++++--------- TestData/setting/tag_test_data.py | 3 +++ TestFile/setting/tag/tag_select.py | 25 +++++++++++++------------ TestFile/setting/tag/tag_select2.py | 8 ++++---- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/TestCase/setting/test_09_tag.py b/TestCase/setting/test_09_tag.py index 2bde97d..e93a0b0 100644 --- a/TestCase/setting/test_09_tag.py +++ b/TestCase/setting/test_09_tag.py @@ -2,12 +2,12 @@ import pytest from Utils import yaml_handler from Utils import req_handler from TestData.setting.tag_test_data import tagData -# -# class TestTag: -# -# yaml_path = r'setting/tag.yaml' -# yaml_data = yaml_handler.yaml_handler.get_case(yaml_path) -# @pytest.mark.flaky(reruns=tagData.rerun, reruns_delay=tagData.rerun_delay) -# @pytest.mark.parametrize('case',yaml_data) -# def test_tag(self,case): -# req_handler.ReqHandler.send_requests(case=case,var_class=tagData) + +class TestTag: + + yaml_path = r'setting/tag.yaml' + yaml_data = yaml_handler.yaml_handler.get_case(yaml_path) + @pytest.mark.flaky(reruns=tagData.rerun, reruns_delay=tagData.rerun_delay) + @pytest.mark.parametrize('case',yaml_data) + def test_tag(self,case): + req_handler.ReqHandler.send_requests(case=case,var_class=tagData) diff --git a/TestData/setting/tag_test_data.py b/TestData/setting/tag_test_data.py index b029d7a..ea2ec39 100644 --- a/TestData/setting/tag_test_data.py +++ b/TestData/setting/tag_test_data.py @@ -1,5 +1,7 @@ from Utils.global_variate import Global from Utils.mockData_handler import data_handler +from Utils.sql_handler import SqlHandler +from Utils.config_handler import base_config class tagData(Global): tag_name = 'autotest_tag%s'%data_handler.random_id() @@ -8,3 +10,4 @@ class tagData(Global): new_tag_name = 'autotest_tag_new_name%s'%data_handler.random_id() new_tag_color = '4C4B63' new_tag_description = 'autotest_tag_new_description' + new_db_coon = 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/tag/tag_select.py b/TestFile/setting/tag/tag_select.py index bc26292..057d3cb 100644 --- a/TestFile/setting/tag/tag_select.py +++ b/TestFile/setting/tag/tag_select.py @@ -1,32 +1,33 @@ -from Utils.sql_handler import test_env_conn from Utils.mockData_handler import data_handler from TestData.setting.tag_test_data import tagData -if hasattr(tagData, 'tag_id'):#先判断有没有创建tag成功 - pass -else: +if not hasattr(tagData, 'tag_id'):#先判断有没有创建tag成功 insert_tag_id = data_handler.random_id() - tag_insert_sql = f"""INSERT INTO willdesk.tag (id,`name`,created_by,sort,status,brand_id,pid,cate,color,description,created_at,updated_at) VALUES - ({insert_tag_id},{tagData.tag_name},{tagData.userId},0,0,{tagData.brandId},'',0,{tagData.tag_color},{tagData.tag_description},'2024-05-06 18:05:04','2024-05-06 18:05:04'); + tag_insert_sql = f"""INSERT INTO willdesk.tag (`id`,`name`,`created_by`,`sort`,`status`,`brand_id`,`pid`,`cate`,`color`,`description`,`created_at`,`updated_at`) VALUES + ({insert_tag_id},'{tagData.tag_name}',{tagData.userId},0,0,{tagData.brandId},'',0,'{tagData.tag_color}','{tagData.tag_description}','2024-05-06 18:05:04','2024-05-06 18:05:04'); """ - test_env_conn.execute_sql(sql=tag_insert_sql) + tagData.new_db_coon.execute_sql(sql=tag_insert_sql) setattr(tagData, 'tag_id', insert_tag_id) + + + tag_select_sql = f'select * from tag where brand_id = {tagData.brandId}' -tag_select_result = test_env_conn.select_many_value(sql=tag_select_sql) +tag_select_result = tagData.new_db_coon.select_many_value(sql=tag_select_sql) tag_num = len(tag_select_result) setattr(tagData, 'tag_num', tag_num) -tag_location = 1 +tag_location = 0 for tag in tag_select_result: if tag['id'] == tagData.tag_id: break tag_location += 1 -if tag_location <= 10: +if tag_location < 10: page_num = 1 elif tag_location % 10 == 0: page_num = tag_location / 10 else: - page_num = tag_location % 10 + 1 -setattr(tagData, 'page_num', page_num) \ No newline at end of file + page_num = int(tag_location / 10) + 1 +setattr(tagData, 'page_num', page_num) + diff --git a/TestFile/setting/tag/tag_select2.py b/TestFile/setting/tag/tag_select2.py index 471055e..fafb581 100644 --- a/TestFile/setting/tag/tag_select2.py +++ b/TestFile/setting/tag/tag_select2.py @@ -1,8 +1,7 @@ -from Utils.sql_handler import test_env_conn from TestData.setting.tag_test_data import tagData tag_select_sql = f'select * from tag where brand_id = {tagData.brandId}' -tag_select_result = test_env_conn.select_many_value(sql=tag_select_sql) +tag_select_result = tagData.new_db_coon.select_many_value(sql=tag_select_sql) tag_location = 1 for tag in tag_select_result: @@ -15,12 +14,13 @@ if tag_location <= 10: elif tag_location % 10 == 0: page_num = tag_location / 10 else: - page_num = tag_location % 10 + 1 + page_num = int(tag_location / 10) + 1 setattr(tagData, 'page_num', page_num) tag_room_select_sql = f'select * from `im_room` where `cate_id` = {tagData.brandId} and `status` = 1 and `is_ignore` = 0 and room_type != 2 and last_msg_uid != {tagData.userId}' -tag_room_select_result = test_env_conn.select_one_value(sql=tag_room_select_sql) +tag_room_select_result = tagData.new_db_coon.select_one_value(sql=tag_room_select_sql) room_id = tag_room_select_result['room_id'] user_id = tag_room_select_result['last_msg_uid'] setattr(tagData, 'room_id', str(room_id)) setattr(tagData, 'user_id', str(user_id)) +tagData.new_db_coon.close_db() \ No newline at end of file -- GitLab