diff --git a/TestData/inbox/channel_test_data.py b/TestData/inbox/channel_test_data.py index 5feb098d3d5857eec2b68ac00a1eac29d88bdf93..749693e56f1bccddef5f847bdddbb80007785ff3 100644 --- a/TestData/inbox/channel_test_data.py +++ b/TestData/inbox/channel_test_data.py @@ -4,4 +4,3 @@ class channelData(Global): pass # brandId = 6052 # shopId = 7238 - diff --git a/TestFile/inbox/channel_select.py b/TestFile/inbox/channel_select.py index 9e88129174e6386cb21430d3b00a8bb6306ad9db..4f64c9b7cd83c8ea2a903b3234e97405f599037a 100644 --- a/TestFile/inbox/channel_select.py +++ b/TestFile/inbox/channel_select.py @@ -11,7 +11,7 @@ setattr(channelData, 'channel_id', channel_id) setattr(channelData, 'channel_name', channel_name) setattr(channelData, 'channel_resource_id', channel_resource_id) -channel_open_room_select_sql = f'select * from `im_room` where site_id = {channel_rel_id} and status = 1 and is_ignore = 0 ' +channel_open_room_select_sql = f'select * from `im_room` where site_id = {channel_rel_id} and status = 1 and is_ignore = 0 and room_type != 2' channel_open_room_select_result = test_env_conn.select_many_value(sql=channel_open_room_select_sql) setattr(channelData, 'channel_open_room_num', len(channel_open_room_select_result)) setattr(channelData, 'channel_open_room_num_add', len(channel_open_room_select_result) + 1) @@ -29,16 +29,16 @@ setattr(channelData, 'customer_service_name', customer_service_list_select_resul setattr(channelData, 'customer_service_image', customer_service_list_select_result[0]['profile']) setattr(channelData, 'customer_service_email', customer_service_list_select_result[0]['email']) -customer_channel_open_room_select_sql = f'select * from `im_room` where site_id = {channel_rel_id} and status = 1 and is_ignore = 0 and allocation_uid = {customer_service_id}' +customer_channel_open_room_select_sql = f'select * from `im_room` where site_id = {channel_rel_id} and status = 1 and room_type != 2 and is_ignore = 0 and allocation_uid = {customer_service_id}' customer_channel_open_room_select_result = test_env_conn.select_many_value(sql=customer_channel_open_room_select_sql) setattr(channelData, 'customer_channel_open_room_num', len(customer_channel_open_room_select_result)) -customer_open_room_select_sql = f'select * from `im_room` where status = 1 and is_ignore = 0 and allocation_uid = {customer_service_id}' +customer_open_room_select_sql = f'select * from `im_room` where status = 1 and room_type != 2 and is_ignore = 0 and allocation_uid = {customer_service_id}' customer_open_room_select_result = test_env_conn.select_many_value(sql=customer_open_room_select_sql) setattr(channelData, 'customer_open_room_num', len(customer_open_room_select_result)) setattr(channelData, 'customer_open_room_num_add', len(customer_open_room_select_result) + 1) -other_room_select_sql = f'select * from `im_room` where allocation_uid != {customer_service_id} and cate_id = {channelData.brandId} and status = 1 limit 10' +other_room_select_sql = f'select * from `im_room` where allocation_uid != {customer_service_id} and room_type != 2 and cate_id = {channelData.brandId} and status = 1 limit 10' other_room_select_result = test_env_conn.select_one_value(sql=other_room_select_sql) setattr(channelData, 'other_room_id', other_room_select_result['room_id']) diff --git a/TestFile/inbox/team_select.py b/TestFile/inbox/team_select.py index 4932a83948d679d995ba1edc70604d40db56ffc8..063db4c4a7315c1ddb090ee2d74f45f75e639d3e 100644 --- a/TestFile/inbox/team_select.py +++ b/TestFile/inbox/team_select.py @@ -15,21 +15,21 @@ team_room_list_select_result = test_env_conn.select_many_value(sql=team_room_lis team_room_list = tuple(i['room_id'] for i in team_room_list_select_result) if team_room_list != (): - open_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 1' + open_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 1 and room_type != 2' open_room_select_result = test_env_conn.select_many_value(sql=open_room_select_sql) - pending_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 2' + pending_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 2 and room_type != 2' pending_room_select_result = test_env_conn.select_many_value(sql=pending_room_select_sql) - close_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 3' + close_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 3 and room_type != 2' close_room_select_result = test_env_conn.select_many_value(sql=close_room_select_sql) setattr(teamData, 'open_room_num', len(open_room_select_result)) setattr(teamData, 'pending_room_num', len(pending_room_select_result)) setattr(teamData, 'close_room_num', len(close_room_select_result)) - other_room_select_sql = f'select * from `im_room` where room_id not in {team_room_list} and site_id = {teamData.shopId} and status = 1 limit 10' + other_room_select_sql = f'select * from `im_room` where room_id not in {team_room_list} and site_id = {teamData.shopId} and room_type != 2 and status = 1 limit 10' else: setattr(teamData, 'open_room_num', 0) setattr(teamData, 'pending_room_num', 0) setattr(teamData, 'close_room_num', 0) - other_room_select_sql = f'select * from `im_room` where `cate_id` = {teamData.brandId} and site_id = {teamData.shopId} and status = 1 limit 10' + other_room_select_sql = f'select * from `im_room` where `cate_id` = {teamData.brandId} and room_type != 2 and site_id = {teamData.shopId} and status = 1 limit 10' other_room_select_result = test_env_conn.select_one_value(sql=other_room_select_sql) setattr(teamData, 'other_room_id', other_room_select_result['room_id']) @@ -48,7 +48,7 @@ setattr(teamData, 'team_member_image', team_member_info_select_result['profile'] setattr(teamData, 'team_member_email', team_member_info_select_result['email']) -team_member_open_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and status = 1 and allocation_uid = {team_member_id}' +team_member_open_room_select_sql = f'select * from `im_room` where room_id in {team_room_list} and room_type != 2 and status = 1 and allocation_uid = {team_member_id}' team_member_open_room_select_result = test_env_conn.select_many_value(sql=team_member_open_room_select_sql) setattr(teamData, 'team_member_open_room_num', len(team_member_open_room_select_result)) diff --git a/TestFile/inbox/ticketInfo_select.py b/TestFile/inbox/ticketInfo_select.py index 95d41d986b4f3c00423ae2c55b9e11f500c30e20..949ec7f6fdbe852f282b50005cb2572759b1cc75 100644 --- a/TestFile/inbox/ticketInfo_select.py +++ b/TestFile/inbox/ticketInfo_select.py @@ -1,12 +1,12 @@ from Utils.sql_handler import test_env_conn from TestData.inbox.ticketInfo_test_data import ticketInfoData -all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `is_ignore` = 0' -wait_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `is_ignore` = 0' -close_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `is_ignore` = 0' -your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0' -your_wait_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0' -your_close_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0' +all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `is_ignore` = 0 and room_type != 2' +wait_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `is_ignore` = 0 and room_type != 2' +close_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `is_ignore` = 0 and room_type != 2' +your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 1 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and room_type != 2' +your_wait_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 2 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and room_type != 2' +your_close_ticket_sql = f'select * from `im_room` where `cate_id` = {ticketInfoData.brandId} and `status` = 3 and `allocation_uid` = {ticketInfoData.userId} and `is_ignore` = 0 and room_type != 2' all_ticket_num = len(test_env_conn.select_many_value(sql=all_ticket_select_sql)) wait_ticket_num = len(test_env_conn.select_many_value(sql=wait_ticket_select_sql)) diff --git a/TestFile/inbox/ticketInfo_select2.py b/TestFile/inbox/ticketInfo_select2.py index 6847ef89955fd4be8491c95f2f2479656023ede8..370f17a61084361765daf0aa1bd6259d7eee1c4e 100644 --- a/TestFile/inbox/ticketInfo_select2.py +++ b/TestFile/inbox/ticketInfo_select2.py @@ -1,7 +1,7 @@ from Utils.sql_handler import test_env_conn from TestData.inbox.ticketInfo_test_data import ticketInfoData -ticket_info_select_sql = f'select * from im_room where room_id = {ticketInfoData.roomId}' +ticket_info_select_sql = f'select * from im_room where room_id = {ticketInfoData.roomId} and room_type != 2' ticket_info_result = test_env_conn.select_one_value(sql=ticket_info_select_sql) setattr(ticketInfoData, 'ticketCustomerImage', ticket_info_result['first_send_avatar']) diff --git a/TestFile/inbox/ticketStatus_selectStatus.py b/TestFile/inbox/ticketStatus_selectStatus.py index ef866ba65151b0f85bf5be188767bf41aa2e233d..db6fa834b0b8fea12f7ce402b444fad44c6bba9a 100644 --- a/TestFile/inbox/ticketStatus_selectStatus.py +++ b/TestFile/inbox/ticketStatus_selectStatus.py @@ -1,10 +1,10 @@ from Utils.sql_handler import test_env_conn from TestData.inbox.ticketStatus_test_data import ticketStatusData -all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `is_ignore` = 0' -your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = {ticketStatusData.userId} and `is_ignore` = 0' -unread_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 1 and `is_ignore` = 0' -unassigned_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = 0 and `is_ignore` = 0' +all_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `is_ignore` = 0 and room_type != 2' +your_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = {ticketStatusData.userId} and `is_ignore` = 0 and room_type != 2' +unread_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 1 and `is_ignore` = 0 and room_type != 2' +unassigned_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `allocation_uid` = 0 and `is_ignore` = 0 and room_type != 2' all_ticket_num = len(test_env_conn.select_many_value(sql=all_ticket_select_sql)) @@ -23,7 +23,7 @@ setattr(ticketStatusData,'unassigned_ticket_num_minus',len(unassigned_ticket_num setattr(ticketStatusData,'unassigned_ticket_id',unassigned_ticket_num[0]['room_id']) -read_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 2 and `room_platform` = "willdesk" and `is_ignore` = 0 and `site_id` = {ticketStatusData.shopId}' +read_ticket_select_sql = f'select * from `im_room` where `cate_id` = {ticketStatusData.brandId} and `status` = 1 and `read_status` = 2 and `room_platform` = "willdesk" and `is_ignore` = 0 and `site_id` = {ticketStatusData.shopId} and room_type != 2' read_ticket_select_result = test_env_conn.select_one_value(sql=read_ticket_select_sql) setattr(ticketStatusData,'read_ticket_id',str(read_ticket_select_result["room_id"])) diff --git a/Utils/log_handler.py b/Utils/log_handler.py index 1bea4cf8d0abd9929ca3d760ce13ff152bd3e3e6..4608ef67814a0149ff3c7e1f9709a251a7e4406e 100644 --- a/Utils/log_handler.py +++ b/Utils/log_handler.py @@ -4,7 +4,7 @@ import os import inspect class LogHandler: - def __init__(self, name='autotest_logger', log_dir='../TestLog'): + def __init__(self, name='autotest_logger', log_dir='./TestLog'): self.logger = logging.getLogger(name) self.logger.setLevel(logging.DEBUG) @@ -13,7 +13,7 @@ class LogHandler: today = datetime.datetime.now().strftime("%Y-%m-%d") log_file = os.path.join(log_dir, f"{today}_log.log") - file_handler = logging.FileHandler(log_file) + file_handler = logging.FileHandler(log_file,encoding='utf-8') formatter = logging.Formatter( '%(asctime)s [%(levelname)s] in %(module)s (line %(lineno)d): %(message)s' @@ -37,5 +37,6 @@ class LogHandler: self.logger.error(formatted_message, *args, **kwargs) # 使用示例： -log_dir = '../TestLog' # 指定日志存放目录 +log_dir = './TestLog' # 指定日志存放目录 logger = LogHandler(name='autotest_logger', log_dir=log_dir) + diff --git a/Utils/req_handler.py b/Utils/req_handler.py index 1754619d28748fd58fd5e2824f0e5051d89c80a5..e7bd326d8c32606d6cef51051b1339b6dac49849 100644 --- a/Utils/req_handler.py +++ b/Utils/req_handler.py @@ -7,6 +7,7 @@ from Utils import config_handler from Utils import global_variate from Utils import path_handler from Utils import websocket_handler +from Utils.log_handler import logger class ReqHandler: @@ -40,19 +41,53 @@ class ReqHandler: @classmethod def send_requests(self,case,var_class): - if isinstance(case,dict): - if case.get('before_sql'): - sql = case['before_sql'] - while sql[0] == '\\' or sql[0] == '/': - sql = sql[1:] - with open(os.path.join(path_handler.TestFile_dir,sql).replace('\\','/'),mode='r',encoding='utf8') as f: - content = f.read() - exec(content) - case = self.params_handler(self,case=case,var_class=var_class) - title = case['title'] - if case.get('ws'): - #识别到ws字段后，直接走ws_request函数，不继续往下面走 - self.ws_requests(self,case) + try: + if isinstance(case,dict): + if case.get('before_sql'): + sql = case['before_sql'] + while sql[0] == '\\' or sql[0] == '/': + sql = sql[1:] + with open(os.path.join(path_handler.TestFile_dir,sql).replace('\\','/'),mode='r',encoding='utf8') as f: + content = f.read() + exec(content) + case = self.params_handler(self,case=case,var_class=var_class) + title = case['title'] + if case.get('ws'): + #识别到ws字段后，直接走ws_request函数，不继续往下面走 + self.ws_requests(self,case) + if case.get('after_sql'): + sql = case['after_sql'] + while sql[0] == '\\' or sql[0] == '/': + sql = sql[1:] + with open(os.path.join(path_handler.TestFile_dir, sql).replace('\\', '/'), mode='r', + encoding='utf8') as f: + content = f.read() + exec(content) + if case.get('sleep'): + time.sleep(float(case['sleep'])) + return 1 + url = case['url'] if 'http' in case['url'] else config_handler.base_config.get_value('url','test_address') + case['url'] #判断是否有域名，没有的话给config文件中的默认测试域名 + method = case['method'] + expected = case['expected'] + if case.get('data'): + data = case['data'] + else: + data = {} + headers = {'Authorization' : getattr(global_variate.Global,'access_token'),'User-Agent' : 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36'} #如果没有请求头，默认赋予一个带token的head + if case.get('headers'): + headers.update(case['headers']) + if method == 'post': + if headers.get('content-type') == 'application/x-www-form-urlencoded' or headers.get('content-type') == 'text/xml': + res = requests.request(url=url,method=method,data=data,headers=headers) + elif headers.get('content-type') == 'multipart/formdata': + res = requests.request(url=url,method=method,files=data,headers=headers) + else: + res = requests.request(url=url,method=method,json=data,headers=headers) + else: + res = requests.request(url=url,method=method,data=data,headers=headers) + self.assert_handler(self,res=res,expected=expected) + if case.get('set_value'): + self.set_value_handler(self,res=res,item=case['set_value'],var_class=var_class) if case.get('after_sql'): sql = case['after_sql'] while sql[0] == '\\' or sql[0] == '/': @@ -63,41 +98,14 @@ class ReqHandler: exec(content) if case.get('sleep'): time.sleep(float(case['sleep'])) - return 1 - url = case['url'] if 'http' in case['url'] else config_handler.base_config.get_value('url','test_address') + case['url'] #判断是否有域名，没有的话给config文件中的默认测试域名 - method = case['method'] - expected = case['expected'] - if case.get('data'): - data = case['data'] + logger.info(f'{title}用例执行成功') else: - data = {} - headers = {'Authorization' : getattr(global_variate.Global,'access_token'),'User-Agent' : 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36'} #如果没有请求头，默认赋予一个带token的head - if case.get('headers'): - headers.update(case['headers']) - if method == 'post': - if headers.get('content-type') == 'application/x-www-form-urlencoded' or headers.get('content-type') == 'text/xml': - res = requests.request(url=url,method=method,data=data,headers=headers) - elif headers.get('content-type') == 'multipart/formdata': - res = requests.request(url=url,method=method,files=data,headers=headers) - else: - res = requests.request(url=url,method=method,json=data,headers=headers) - else: - res = requests.request(url=url,method=method,data=data,headers=headers) - self.assert_handler(self,res=res,expected=expected) - if case.get('set_value'): - self.set_value_handler(self,res=res,item=case['set_value'],var_class=var_class) - if case.get('after_sql'): - sql = case['after_sql'] - while sql[0] == '\\' or sql[0] == '/': - sql = sql[1:] - with open(os.path.join(path_handler.TestFile_dir, sql).replace('\\', '/'), mode='r', - encoding='utf8') as f: - content = f.read() - exec(content) - if case.get('sleep'): - time.sleep(float(case['sleep'])) - else: - raise TypeError('用例格式有误') + raise TypeError('用例格式有误') + except AssertionError: + logger.error(f'{title}用例执行失败，失败原因：断言不通过\n期望值{expected}\n实际返回值{res.text}') + except Exception as e: + logger.error(f'{title}用例执行失败，失败原因：{e}') + raise Exception def ws_requests(self,case): ''' diff --git a/YamlCase/inbox/livechat.yaml b/YamlCase/inbox/livechat.yaml index ee09598dad050d1f85ba9f6a41f4d4ac61af8862..3dad98e96672e80e5d4c368a8c807440fbc0f40b 100644 --- a/YamlCase/inbox/livechat.yaml +++ b/YamlCase/inbox/livechat.yaml @@ -162,6 +162,7 @@ api17: title: b端主动发起会话 - 笔记 ws: willdesk action: sendmsg + sleep: 1 data: type: text roomId: "${roomId}" diff --git a/main.py b/main.py index a4f79198a3ac0437ddbcb9bb4e750898ed0a49af..9c31c9a168296ea3a123c4097e2350b7cfa0eba4 100644 --- a/main.py +++ b/main.py @@ -1,10 +1,11 @@ import pytest -import os from Utils.sql_handler import test_env_conn if __name__ == '__main__': try: - pytest.main(['-vs',r'C:\Users\rd71\PycharmProjects\willdesk_api_auto\TestCase',f'--alluredir=./allureReports','--clean-alluredir']) + # pytest.main(['-vs',r'C:\Users\rd71\PycharmProjects\willdesk_api_auto\TestCase\inbox\test_06_channel.py',f'--alluredir=./allureReports/json','--clean-alluredir']) + pytest.main(['-vs',r'C:\Users\rd71\PycharmProjects\willdesk_api_auto\TestCase\inbox\test_06_channel.py',f'--html=./report.html']) #allure报告一直生成不了，改用pytest自带报告 + finally: test_env_conn.close_db() #关闭数据库链接