mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2025-01-11 21:13:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix test_calls_on_multiple_connections after adding room reconnection

Browse source
This commit is contained in:
Antonio Scandurra 2022-12-09 08:58:18 +01:00
parent aca3f02590
commit 8fa26bfe18
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
crates/collab/src/integration_tests.rs
View file

@ -437,7 +437,6 @@ async fn test_disconnecting_from_room(
server.forbid_connections(); server.forbid_connections();
server.disconnect_client(client_a.peer_id().unwrap()); server.disconnect_client(client_a.peer_id().unwrap());
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT + crate::rpc::RECONNECTION_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT + crate::rpc::RECONNECTION_TIMEOUT);
deterministic.run_until_parked();
active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none())); active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none())); active_call_b.read_with(cx_b, |call, _| assert!(call.room().is_none()));
assert_eq!( assert_eq!(
@ -458,7 +457,6 @@ async fn test_disconnecting_from_room(
// Allow user A to reconnect to the server. // Allow user A to reconnect to the server.
server.allow_connections(); server.allow_connections();
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT);
deterministic.run_until_parked();
// Call user B again from client A. // Call user B again from client A.
active_call_a active_call_a
@ -642,12 +640,15 @@ async fn test_calls_on_multiple_connections(
assert!(incoming_call_b2.next().await.unwrap().is_some()); assert!(incoming_call_b2.next().await.unwrap().is_some());
// User A disconnects, causing both connections to stop ringing. // User A disconnects, causing both connections to stop ringing.
server.forbid_connections();
server.disconnect_client(client_a.peer_id().unwrap()); server.disconnect_client(client_a.peer_id().unwrap());
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT + crate::rpc::RECONNECTION_TIMEOUT);
assert!(incoming_call_b1.next().await.unwrap().is_none()); assert!(incoming_call_b1.next().await.unwrap().is_none());
assert!(incoming_call_b2.next().await.unwrap().is_none()); assert!(incoming_call_b2.next().await.unwrap().is_none());
// User A reconnects automatically, then calls user B again. // User A reconnects automatically, then calls user B again.
server.allow_connections();
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT);
active_call_a active_call_a
.update(cx_a, |call, cx| { .update(cx_a, |call, cx| {
call.invite(client_b1.user_id().unwrap(), None, cx) call.invite(client_b1.user_id().unwrap(), None, cx)
@ -662,7 +663,7 @@ async fn test_calls_on_multiple_connections(
server.forbid_connections(); server.forbid_connections();
server.disconnect_client(client_b1.peer_id().unwrap()); server.disconnect_client(client_b1.peer_id().unwrap());
server.disconnect_client(client_b2.peer_id().unwrap()); server.disconnect_client(client_b2.peer_id().unwrap());
deterministic.advance_clock(rpc::RECEIVE_TIMEOUT); deterministic.advance_clock(rpc::RECEIVE_TIMEOUT + crate::rpc::RECONNECTION_TIMEOUT);
active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none())); active_call_a.read_with(cx_a, |call, _| assert!(call.room().is_none()));
} }