@@ -74,13 +74,12 @@ async def handler(request: web.BaseRequest) -> NoReturn:
7474async def test_raw_server_logs_invalid_method_with_loop_debug (
7575 aiohttp_raw_server : AiohttpRawServer , aiohttp_client : AiohttpClient
7676) -> None :
77- loop = asyncio .get_running_loop ()
7877 exc = BadHttpMethod (b"\x16 \x03 \x03 \x01 F\x01 " .decode (), "error" )
7978
8079 async def handler (request : web .BaseRequest ) -> NoReturn :
8180 raise exc
8281
83- loop = asyncio .get_event_loop ()
82+ loop = asyncio .get_running_loop ()
8483 loop .set_debug (True )
8584 logger = mock .Mock ()
8685 server = await aiohttp_raw_server (handler , logger = logger )
@@ -120,13 +119,12 @@ async def handler(request: web.BaseRequest) -> NoReturn:
120119async def test_raw_server_logs_invalid_method_without_loop_debug (
121120 aiohttp_raw_server : AiohttpRawServer , aiohttp_client : AiohttpClient
122121) -> None :
123- loop = asyncio .get_running_loop ()
124122 exc = BadHttpMethod (b"\x16 \x03 \x03 \x01 F\x01 " .decode (), "error" )
125123
126124 async def handler (request : web .BaseRequest ) -> NoReturn :
127125 raise exc
128126
129- loop = asyncio .get_event_loop ()
127+ loop = asyncio .get_running_loop ()
130128 loop .set_debug (False )
131129 logger = mock .Mock ()
132130 server = await aiohttp_raw_server (handler , logger = logger )
@@ -150,7 +148,6 @@ async def handler(request: web.BaseRequest) -> NoReturn:
150148async def test_raw_server_logs_invalid_method_second_request (
151149 aiohttp_raw_server : AiohttpRawServer , aiohttp_client : AiohttpClient
152150) -> None :
153- loop = asyncio .get_running_loop ()
154151 exc = BadHttpMethod (b"\x16 \x03 \x03 \x01 F\x01 " .decode (), "error" )
155152 request_count = 0
156153
@@ -161,7 +158,7 @@ async def handler(request: web.BaseRequest) -> web.Response:
161158 raise exc
162159 return web .Response ()
163160
164- loop = asyncio .get_event_loop ()
161+ loop = asyncio .get_running_loop ()
165162 loop .set_debug (False )
166163 logger = mock .Mock ()
167164 server = await aiohttp_raw_server (handler , logger = logger )
@@ -182,13 +179,12 @@ async def handler(request: web.BaseRequest) -> web.Response:
182179async def test_raw_server_logs_bad_status_line_as_exception (
183180 aiohttp_raw_server : AiohttpRawServer , aiohttp_client : AiohttpClient
184181) -> None :
185- loop = asyncio .get_running_loop ()
186182 exc = BadStatusLine (b"\x16 \x03 \x03 \x01 F\x01 " .decode (), "error" )
187183
188184 async def handler (request : web .BaseRequest ) -> NoReturn :
189185 raise exc
190186
191- loop = asyncio .get_event_loop ()
187+ loop = asyncio .get_running_loop ()
192188 loop .set_debug (False )
193189 logger = mock .Mock ()
194190 server = await aiohttp_raw_server (handler , logger = logger )
0 commit comments