Skip to content

fix: resolve test hang with websockets 14+ #3720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
SamMorrowDrums wants to merge 1 commit into from
+12 −5
Closed

fix: resolve test hang with websockets 14+ #3720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 deletions tests/conftest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,10 +235,9 @@ def install_signal_handlers(self) -> None:
async def serve(self, sockets=None):
self.restart_requested = asyncio.Event()

loop = asyncio.get_event_loop()
tasks = {
loop.create_task(super().serve(sockets=sockets)),
loop.create_task(self.watch_restarts()),
asyncio.create_task(super().serve(sockets=sockets)),
asyncio.create_task(self.watch_restarts()),
}
await asyncio.wait(tasks)

Expand Down Expand Up @@ -269,7 +268,15 @@ async def watch_restarts(self) -> None: # pragma: no cover


def serve_in_thread(server: TestServer) -> typing.Iterator[TestServer]:
thread = threading.Thread(target=server.run)
def run_server():
loop = asyncio.new_event_loop()
asyncio.set_event_loop(loop)
try:
loop.run_until_complete(server.serve())
finally:
loop.close()

thread = threading.Thread(target=run_server)
thread.start()
try:
while not server.started:
Expand All @@ -282,6 +289,6 @@ def serve_in_thread(server: TestServer) -> typing.Iterator[TestServer]:

@pytest.fixture(scope="session")
def server() -> typing.Iterator[TestServer]:
config = Config(app=app, lifespan="off", loop="asyncio")
config = Config(app=app, lifespan="off")
server = TestServer(config=config)
yield from serve_in_thread(server)
Loading