Skip to content

Commit 743a425

Browse files
committed
FIX: Live client test flakiness
1 parent 6c70c16 commit 743a425

2 files changed

Lines changed: 15 additions & 9 deletions

File tree

databento/live/dbn.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import asyncio
22
import logging
33
import queue
4+
import threading
45
from concurrent import futures
56
from typing import Callable, NewType, Optional, Union
67

@@ -57,6 +58,7 @@ def __init__(
5758
self._dbn_queue: Optional[DBNQueue] = None
5859
self._decoder: databento_dbn.DbnDecoder = databento_dbn.DbnDecoder()
5960
self._disconnected: "asyncio.Future[None]" = loop.create_future()
61+
self._transport_lock = threading.Lock()
6062
self._transport = transport
6163

6264
def __aiter__(self) -> "DBNProtocol":
@@ -90,7 +92,8 @@ async def __anext__(self) -> DBNStruct:
9092
"resuming reading with %d pending records",
9193
self._dbn_queue.qsize(),
9294
)
93-
self._transport.resume_reading()
95+
with self._transport_lock:
96+
self._transport.resume_reading()
9497

9598
raise StopAsyncIteration()
9699

@@ -118,7 +121,8 @@ def __next__(self) -> DBNStruct:
118121
"resuming reading with %d pending records",
119122
self._dbn_queue.qsize(),
120123
)
121-
self._transport.resume_reading()
124+
with self._transport_lock:
125+
self._transport.resume_reading()
122126

123127
raise StopIteration()
124128

@@ -171,7 +175,8 @@ def buffer_updated(self, nbytes: int) -> None:
171175
self._decoder.write(record_bytes)
172176
except ValueError:
173177
logger.critical("could not write to dbn decoder")
174-
self._transport.close()
178+
with self._transport_lock:
179+
self._transport.close()
175180

176181
try:
177182
records = self._decoder.decode()
@@ -210,4 +215,5 @@ def buffer_updated(self, nbytes: int) -> None:
210215
"record queue is full; %d record(s) to be processed",
211216
self._dbn_queue.qsize(),
212217
)
213-
self._transport.pause_reading()
218+
with self._transport_lock:
219+
self._transport.pause_reading()

tests/test_live_client.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import pathlib
44
import platform
55
from io import BytesIO
6-
from typing import Callable
6+
from typing import Callable, List
77
from unittest.mock import MagicMock
88

99
import databento_dbn
@@ -571,11 +571,11 @@ async def test_live_async_iteration(
571571
symbols="TEST",
572572
)
573573

574-
live_client.start()
574+
records: List[dbn.DBNStruct] = []
575575

576-
records = []
577-
async for record in live_client:
578-
records.append(record)
576+
live_client.start()
577+
live_client.add_callback(records.append)
578+
await live_client.wait_for_close()
579579

580580
assert len(records) == 3
581581
assert isinstance(records[0], databento_dbn.Metadata)

0 commit comments

Comments
 (0)