mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-19 06:04:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

test(ui): Use FutureExt::now_or_never instead of .await.

Browse Source 
This patch uses `FutureExt::now_or_never` so that we don't wait on the
future to be resolved to get a result. If we have a bug in our code and
the test expects a value, the test will hang forever, which is not a
desired behavior. With `now_or_never`, this situation cannot happen.
This commit is contained in:
Ivan Enderlin
2023-06-01 08:39:44 +02:00
parent c82c0e46be
commit fbe8826159
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
crates/matrix-sdk-ui/tests/integration/timeline/sliding_sync.rs
View File

@@ -3,7 +3,7 @@ use std::{pin::Pin, sync::Arc};
use anyhow::{Context, Result};
use assert_matches::assert_matches;
use eyeball_im::{Vector, VectorDiff};
use futures_util::{pin_mut, Stream, StreamExt};
use futures_util::{pin_mut, FutureExt, Stream, StreamExt};
use matrix_sdk::{
SlidingSync, SlidingSyncList, SlidingSyncListBuilder, SlidingSyncMode, UpdateSummary,
};
@@ -61,8 +61,8 @@ macro_rules! assert_timeline_stream {
$( $accumulator )*
{
assert_matches!(
$stream.next().await,
Some(VectorDiff::PushBack { value }) => {
$stream.next().now_or_never(),
Some(Some(VectorDiff::PushBack { value })) => {
assert_matches!(value.as_ref(), TimelineItem::Virtual(VirtualTimelineItem::DayDivider(_)));
}
);
@@ -81,8 +81,8 @@ macro_rules! assert_timeline_stream {
$( $accumulator )*
{
assert_matches!(
$stream.next().await,
Some(VectorDiff::PushBack { value }) => {
$stream.next().now_or_never(),
Some(Some(VectorDiff::PushBack { value })) => {
assert_matches!(
value.as_ref(),
TimelineItem::Event(event_timeline_item) => {
@@ -106,8 +106,8 @@ macro_rules! assert_timeline_stream {
$( $accumulator )*
{
assert_matches!(
$stream.next().await,
Some(VectorDiff::Set { index: $index, value }) => {
$stream.next().now_or_never(),
Some(Some(VectorDiff::Set { index: $index, value })) => {
assert_matches!(
value.as_ref(),
TimelineItem::Event(event_timeline_item) => {
@@ -131,8 +131,8 @@ macro_rules! assert_timeline_stream {
$( $accumulator )*
{
assert_matches!(
$stream.next().await,
Some(VectorDiff::Remove { index: $index })
$stream.next().now_or_never(),
Some(Some(VectorDiff::Remove { index: $index }))
);
}
]