diff --git a/conftest.py b/conftest.py index 1bc522bbf25dc80c590b4d55dcc55323bc00b86b..2c5100b3ffbb5f516fca14b0b89fd4d72ba4f530 100644 --- a/conftest.py +++ b/conftest.py @@ -1,3 +1,5 @@ +import asyncio +from Utils.sql_handler import test_env_conn import pytest import requests import time @@ -88,6 +90,7 @@ def customer_login(): login_res = session.post(url=login_url,json=data,headers=headers).json() setattr(global_variate.Global,'clientToken',login_res['data']['accessToken']) setattr(global_variate.Global,'customerId',login_res['data']['customerId']) + setattr(global_variate.Global,'customerName',login_res['data']['name']) address = 'wss://atestws.sealapps.com/ws' if env == 'test' else 'wss://ws.willdesk.com/ws' print(f'{address}?platform=1&authorization={global_variate.Global.access_token}&t={int(time.time())}') @@ -98,9 +101,17 @@ def customer_login(): url=f'{address}?platform=1&authorization={global_variate.Global.clientToken}&t={int(time.time())}', attr='customer') # c端websocket链接 - +async def close_ws(): + await asyncio.gather(asyncio.create_task(websocket_handler.ws_willdesk.close()),asyncio.create_task(websocket_handler.ws_client.close())) @pytest.fixture(scope='session',autouse=True) def call_fixture(): #自定义调用顺序 willdesk_login() - customer_login() \ No newline at end of file + customer_login() + yield + test_env_conn.close_db() + loop = websocket_handler.loop + loop.run_until_complete(close_ws()) + loop.stop() + loop.close() +