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

sliding_sync: Add test to make sure stream updates are in correct order

Browse Source 
I have also changed the priorities so that manual updates are preferred.
This means that duplicate updates do not happen if the room was previously unknown.

Signed-off-by: Timo Kösters <timo@koesters.xyz>
This commit is contained in:
Timo Kösters
2024-01-16 11:53:54 +01:00
committed by Benjamin Bouvier
parent e87a7954a0
commit 304bd910f0
2 changed files with 135 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
crates/matrix-sdk-ui/src/room_list_service/room_list.rs
View File

@@ -152,18 +152,7 @@ impl RoomList {
let raw_stream_with_recv = stream! {
loop {
select! {
biased;
v = raw_stream.next() => {
if let Some(v) = v {
for change in &v {
change.clone().apply(&mut raw_current_values);
}
yield v;
} else {
// Restart immediately, don't keep on waiting for the receiver
break;
}
}
biased; // Prefer manual updates for easier test code
Ok(room_id) = roominfo_update_recv.recv() => {
// Search list for the updated room
for (index, room) in raw_current_values.iter().enumerate() {
@@ -176,6 +165,17 @@ impl RoomList {
}
}
}
v = raw_stream.next() => {
if let Some(v) = v {
for change in &v {
change.clone().apply(&mut raw_current_values);
}
yield v;
} else {
// Restart immediately, don't keep on waiting for the receiver
break;
}
}
}
}
};

130
crates/matrix-sdk-ui/tests/integration/room_list_service.rs
View File

@@ -1728,9 +1728,6 @@ async fn test_dynamic_entries_stream() -> Result<(), Error> {
insert[2] [ F("!r4:bar.org") ];
end;
};
// TODO: don't cause duplicate updates
dynamic_entries_stream.next().await.unwrap();
dynamic_entries_stream.next().await.unwrap();
assert_pending!(dynamic_entries_stream);
sync_then_assert_request_and_fake_response! {
@@ -1800,8 +1797,6 @@ async fn test_dynamic_entries_stream() -> Result<(), Error> {
insert[4] [ F("!r7:bar.org") ];
end;
};
dynamic_entries_stream.next().await.unwrap();
dynamic_entries_stream.next().await.unwrap();
assert_pending!(dynamic_entries_stream);
// Now, let's change the dynamic entries!
@@ -1962,15 +1957,136 @@ async fn test_dynamic_entries_stream_manual_update() -> Result<(), Error> {
};
assert_pending!(dynamic_entries_stream);
// Updating the summary will cause an updat
sync_then_assert_request_and_fake_response! {
[server, room_list, sync]
states = SettingUp => Running,
assert request >= {
"lists": {
ALL_ROOMS: {
"ranges": [[0, 9]],
},
VISIBLE_ROOMS: {
"ranges": [[0, 19]],
},
INVITES: {
"ranges": [[0, 19]],
},
},
},
respond with = {
"pos": "1",
"lists": {
ALL_ROOMS: {
"count": 10,
"ops": [
{
"op": "SYNC",
"range": [0, 1],
"room_ids": [
"!r1:bar.org",
"!r0:bar.org",
],
},
],
},
VISIBLE_ROOMS: {
"count": 0,
},
INVITES: {
"count": 0,
},
},
"rooms": {
"!r1:bar.org": {
"name": "Matrix Bar",
"initial": true,
"timeline": [],
},
},
},
};
// Assert the dynamic entries.
assert_entries_batch! {
[dynamic_entries_stream]
set[0] [ F("!r1:bar.org") ];
insert[1] [ F("!r0:bar.org") ];
end;
};
// Variation 1: Send manual update after reading stream, !r0 should be at new pos 1
let room = client.get_room(room_id!("!r0:bar.org")).unwrap();
room.update_summary(room.clone_info()).await;
assert_entries_batch! {
[dynamic_entries_stream]
set[0] [ F("!r0:bar.org") ];
set[1] [ F("!r0:bar.org") ];
end;
};
assert_pending!(dynamic_entries_stream);
sync_then_assert_request_and_fake_response! {
[server, room_list, sync]
states = Running => Running,
assert request >= {
"lists": {
ALL_ROOMS: {
"ranges": [[0, 9]],
},
VISIBLE_ROOMS: {
"ranges": [[0, 19]],
},
INVITES: {
"ranges": [[0, 0]],
},
},
},
respond with = {
"pos": "2",
"lists": {
ALL_ROOMS: {
"count": 10,
"ops": [
{
"op": "SYNC",
"range": [0, 1],
"room_ids": [
"!r0:bar.org",
"!r1:bar.org",
],
},
],
},
VISIBLE_ROOMS: {
"count": 0,
},
INVITES: {
"count": 0,
},
},
"rooms": {},
},
};
// Variation 2: Send manual update before reading stream, !r0 should still be at previous pos 1
let room = client.get_room(room_id!("!r0:bar.org")).unwrap();
room.update_summary(room.clone_info()).await;
assert_entries_batch! {
[dynamic_entries_stream]
set[1] [ F("!r0:bar.org") ];
end;
};
// Assert the dynamic entries.
assert_entries_batch! {
[dynamic_entries_stream]
set[0] [ F("!r0:bar.org") ];
set[1] [ F("!r1:bar.org") ];
end;
};
assert_pending!(dynamic_entries_stream);
Ok(())