diff --git a/Utils/websocket_handler.py b/Utils/websocket_handler.py index 407a434b26036ca8a94f675bc582386a093317ad..b13c8894ded0b7eb60bd4154ea72e2807d0497e0 100644 --- a/Utils/websocket_handler.py +++ b/Utils/websocket_handler.py @@ -5,7 +5,7 @@ from Utils.global_variate import Global from TestData.inbox.livechat_test_data import livechatData loop = asyncio.get_event_loop() #异步主线 - +loop.set_debug(True) class ws: def __init__(self, url, attr): @@ -83,8 +83,19 @@ async def ws_action(ws,case): action = case['action'] #操作 if action == 'sendmsg': response = await ws_send_handler(case=case,ws=ws) - assert response['response']['code'] == 200 - assert response['action'] == 'sendmsg' + if response.get('code'): + assert response['code'] == 200 + else: + assert response['response']['code'] == 200 + # type = case['data']['type'] + # if type in ['emoji','file','link','rate','product']: + # if type not in ['file','rate','emoji']: #type等于file的时候,后端返回的action,willdesk端是sendmsg,c端又是readMsg,干脆不作判断了 + # assert response['data']['action'] == 'sendmsg' + # + # else: + # assert response['response']['code'] == 200 + # assert response['action'] == 'sendmsg' + elif action == 'receive': expected = case['expected'] # 断言 @@ -189,7 +200,7 @@ async def ws_run(ws,case): :param case: 传入用例数据 ''' # asyncio.run(ws_action(ws=ws,case=case)) - task = asyncio.ensure_future(ws_action(ws=ws,case=case)) + task = asyncio.create_task(ws_action(ws=ws,case=case)) await asyncio.wait_for(task,timeout=10) # loop.run_until_complete(ws_action(ws=ws,case=case))