1
0

Merge 'release-v1.136' into 'master'

This commit is contained in:
Andrew Morgan
2025-08-12 15:36:51 +01:00
parent 4054d956f7
commit 283ade8e33
402 changed files with 8961 additions and 2567 deletions

View File

@@ -42,15 +42,18 @@ class BatchingQueueTestCase(TestCase):
# We ensure that we remove any existing metrics for "test_queue".
try:
number_queued.remove("test_queue")
number_of_keys.remove("test_queue")
number_in_flight.remove("test_queue")
number_queued.remove("test_queue", "test_server")
number_of_keys.remove("test_queue", "test_server")
number_in_flight.remove("test_queue", "test_server")
except KeyError:
pass
self._pending_calls: List[Tuple[List[str], defer.Deferred]] = []
self.queue: BatchingQueue[str, str] = BatchingQueue(
"test_queue", hs_clock, self._process_queue
name="test_queue",
server_name="test_server",
clock=hs_clock,
process_batch_callback=self._process_queue,
)
async def _process_queue(self, values: List[str]) -> str: