velvox
/
litecord
mirror of https://gitlab.com/litecord/litecord.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: remove unecessary asyncio event 

queue's get() already blocks if no items are in the queue.
This commit is contained in:
Luna 2022-01-28 23:52:46 -03:00
parent 4a70d9580d
commit 2180fbca02
1 changed files with 1 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/test_websocket.py
View File

@ -57,7 +57,6 @@ class AsyncWebsocket:
self.ws = WSConnection(ConnectionType.CLIENT) self.ws = WSConnection(ConnectionType.CLIENT)
self.reader, self.writer = None, None self.reader, self.writer = None, None
self.reader_task = None self.reader_task = None
self._waiting_for_message_event = None
self._events = asyncio.Queue() self._events = asyncio.Queue()
async def send(self, data): async def send(self, data):
@ -73,13 +72,8 @@ class AsyncWebsocket:
await self.writer.drain() await self.writer.drain()
async def _reader_loop_task(self): async def _reader_loop_task(self):
# continuously read messages from the socket # continuously read messages from the socket
# and fill up the _events queue with them # and fill up the _events queue with them
#
# if a recv() coroutine has been waiting for an event
# (via _waiting_for_message_event), then set that event so that
# we immediately process it
while True: while True:
log.info("reading data") log.info("reading data")
in_data = await self.reader.read(4096) in_data = await self.reader.read(4096)
@ -94,26 +88,12 @@ class AsyncWebsocket:
log.debug("queued ws event {}", event) log.debug("queued ws event {}", event)
await self._events.put(event) await self._events.put(event)
if not self._events.empty() and self._waiting_for_message_event:
self._waiting_for_message_event.set()
# since we closed, we don't have to continue reading # since we closed, we don't have to continue reading
if not in_data: if not in_data:
return return
async def recv(self, *, expect=Message, process_event: bool = True): async def recv(self, *, expect=Message, process_event: bool = True):
# if queue is empty, wait until it's filled up
if self._events.empty():
self._waiting_for_message_event = asyncio.Event()
try:
await asyncio.wait(
[self._waiting_for_message_event.wait(), self.reader_task],
return_when=asyncio.FIRST_COMPLETED,
)
finally:
self._waiting_for_message_event = None
# this loop is only done so we reply to pings while also being # this loop is only done so we reply to pings while also being
# able to receive any other event in the middle. # able to receive any other event in the middle.
# #
@ -123,7 +103,7 @@ class AsyncWebsocket:
while True: while True:
# if we get a ping, reply with pong immediately # if we get a ping, reply with pong immediately
# and fetch the next event # and fetch the next event
event = self._events.get_nowait() event = await self._events.get()
log.debug("processing {}", event) log.debug("processing {}", event)
if isinstance(event, Ping): if isinstance(event, Ping):