Skip to content

Commit 80fabde

Browse files
committed
test(sdj): Fix test_redact_touches_threads if async runtime is slow.
1 parent 8ba8d42 commit 80fabde

1 file changed

Lines changed: 30 additions & 1 deletion

File tree

  • crates/matrix-sdk/tests/integration/event_cache

crates/matrix-sdk/tests/integration/event_cache/threads.rs

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -670,7 +670,36 @@ async fn test_redact_touches_threads() {
670670
)
671671
.await;
672672

673-
let (room_events, mut room_stream) = room_event_cache.subscribe().await.unwrap();
673+
let (mut room_events, mut room_stream) = room_event_cache.subscribe().await.unwrap();
674+
675+
// Wait for initial events of `room_events`.
676+
if room_events.is_empty() {
677+
// Wait for a first update.
678+
let mut vector = Vector::new();
679+
680+
assert_let_timeout!(
681+
Ok(RoomEventCacheUpdate::UpdateTimelineEvents(TimelineVectorDiffs { diffs, .. })) =
682+
room_stream.recv()
683+
);
684+
685+
for diff in diffs {
686+
diff.apply(&mut vector);
687+
}
688+
689+
while !room_stream.is_empty() {
690+
assert_let_timeout!(
691+
Ok(RoomEventCacheUpdate::UpdateTimelineEvents(TimelineVectorDiffs { diffs, .. })) =
692+
room_stream.recv()
693+
);
694+
695+
for diff in diffs {
696+
diff.apply(&mut vector);
697+
}
698+
}
699+
700+
room_events.extend(vector)
701+
}
702+
674703
let thread_events = wait_for_initial_events(thread_events, &mut thread_stream).await;
675704

676705
// Sanity check: both events are present in the thread, and the thread summary

0 commit comments

Comments
 (0)