Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions tests/unit/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -541,12 +541,17 @@ def run(self, sockets: list[socket] | None = None) -> None:

def serve_in_thread(server: TestServer) -> Iterator[TestServer]:
"""Run a server in a background thread and yield it."""
thread = threading.Thread(target=server.run)
thread = threading.Thread(target=server.run, daemon=True)
thread.start()
try:
while not server.started:
time.sleep(1e-3)
yield server
finally:
server.should_exit = True
thread.join()
thread.join(timeout=10)
if thread.is_alive():
# Uvicorn occasionally ignores should_exit; force_exit aborts the
# asyncio loop so teardown cannot hang the suite indefinitely.
server.force_exit = True
thread.join(timeout=5)
Loading