Skip to content

Commit b3ddde3

Browse files
committed
Capture logs of test_recovery test
Otherwise they end up overrunning Twisted’s AMP protocol message size and raising a `TooLong` error.
1 parent 4967e70 commit b3ddde3

1 file changed

Lines changed: 21 additions & 18 deletions

File tree

tests/storage/databases/main/test_events_worker.py

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -449,24 +449,27 @@ def test_failure(self) -> None:
449449

450450
def test_recovery(self) -> None:
451451
"""Test that event fetchers recover after a database outage."""
452-
with self._outage():
453-
# Kick off a bunch of event fetches but do not pump the reactor
454-
event_deferreds = []
455-
for event_id in self.event_ids:
456-
event_deferreds.append(ensureDeferred(self.store.get_event(event_id)))
457-
458-
# We should have maxed out on event fetcher threads
459-
self.assertEqual(self.store._event_fetch_ongoing, EVENT_QUEUE_THREADS)
460-
461-
# All the event fetchers will fail
462-
self.pump()
463-
self.assertEqual(self.store._event_fetch_ongoing, 0)
464-
465-
for event_deferred in event_deferreds:
466-
failure = self.get_failure(event_deferred, Exception)
467-
self.assertEqual(
468-
str(failure.value), "Could not connect to the database."
469-
)
452+
with self.assertLogs(
453+
"synapse.metrics.background_process_metrics", level="ERROR"
454+
):
455+
with self._outage():
456+
# Kick off a bunch of event fetches but do not pump the reactor
457+
event_deferreds = []
458+
for event_id in self.event_ids:
459+
event_deferreds.append(ensureDeferred(self.store.get_event(event_id)))
460+
461+
# We should have maxed out on event fetcher threads
462+
self.assertEqual(self.store._event_fetch_ongoing, EVENT_QUEUE_THREADS)
463+
464+
# All the event fetchers will fail
465+
self.pump()
466+
self.assertEqual(self.store._event_fetch_ongoing, 0)
467+
468+
for event_deferred in event_deferreds:
469+
failure = self.get_failure(event_deferred, Exception)
470+
self.assertEqual(
471+
str(failure.value), "Could not connect to the database."
472+
)
470473

471474
# This next event fetch should succeed
472475
self.get_success(self.store.get_event(self.event_ids[0]))

0 commit comments

Comments
 (0)