@@ -131,7 +131,8 @@ async def handler(reader: asyncio.StreamReader, writer: asyncio.StreamWriter):
131131 handler , host = ip_address , port = port , ssl = context
132132 )
133133 logger .debug ("Listening on 127.0.0.1:3307" )
134- asyncio .create_task (server .serve_forever ())
134+ # Start accepting connections without creating a long-running serve_forever task.
135+ await server .start_serving ()
135136 return server
136137
137138
@@ -164,8 +165,10 @@ def f(loop):
164165 # Stop the server after the test is complete
165166 async def stop_server ():
166167 logger .debug ("inside_cleanup closing server" )
167- server_fut .result ().close ()
168- loop .shutdown_asyncgens ()
168+ server = server_fut .result ()
169+ server .close ()
170+ await server .wait_closed ()
171+ await loop .shutdown_asyncgens ()
169172 loop .stop ()
170173 logger .debug ("inside_cleanup end" )
171174
@@ -207,8 +210,10 @@ def f(loop):
207210 # Stop the server after the test is complete
208211 async def stop_server ():
209212 logger .debug ("inside_cleanup closing server" )
210- server_fut .result ().close ()
211- loop .shutdown_asyncgens ()
213+ server = server_fut .result ()
214+ server .close ()
215+ await server .wait_closed ()
216+ await loop .shutdown_asyncgens ()
212217 loop .stop ()
213218 logger .debug ("inside_cleanup end" )
214219
0 commit comments