mirror of
https://github.com/zed-industries/zed.git
synced 2024-09-19 18:41:56 +03:00
Insert random delays when sending and receiving websocket messages in tests
Co-Authored-By: Nathan Sobo <nathan@zed.dev>
This commit is contained in:
parent
d241ab6370
commit
2b8685c1a2
@ -94,7 +94,7 @@ impl FakeServer {
|
|||||||
Err(EstablishConnectionError::Unauthorized)?
|
Err(EstablishConnectionError::Unauthorized)?
|
||||||
}
|
}
|
||||||
|
|
||||||
let (client_conn, server_conn, _) = Connection::in_memory();
|
let (client_conn, server_conn, _) = Connection::in_memory(cx.background());
|
||||||
let (connection_id, io, incoming) = self.peer.add_connection(server_conn).await;
|
let (connection_id, io, incoming) = self.peer.add_connection(server_conn).await;
|
||||||
cx.background().spawn(io).detach();
|
cx.background().spawn(io).detach();
|
||||||
*self.incoming.lock() = Some(incoming);
|
*self.incoming.lock() = Some(incoming);
|
||||||
|
@ -5,7 +5,7 @@ use collections::HashMap;
|
|||||||
use parking_lot::Mutex;
|
use parking_lot::Mutex;
|
||||||
use postage::{barrier, prelude::Stream as _};
|
use postage::{barrier, prelude::Stream as _};
|
||||||
use rand::prelude::*;
|
use rand::prelude::*;
|
||||||
use smol::{channel, prelude::*, Executor, Timer};
|
use smol::{channel, future::yield_now, prelude::*, Executor, Timer};
|
||||||
use std::{
|
use std::{
|
||||||
any::Any,
|
any::Any,
|
||||||
fmt::{self, Debug, Display},
|
fmt::{self, Debug, Display},
|
||||||
@ -528,6 +528,17 @@ impl Background {
|
|||||||
task.await;
|
task.await;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn simulate_random_delay(&self) {
|
||||||
|
match self {
|
||||||
|
Self::Deterministic { executor, .. } => {
|
||||||
|
if executor.state.lock().rng.gen_range(0..100) < 20 {
|
||||||
|
yield_now().await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
_ => panic!("this method can only be called on a deterministic executor"),
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Scope<'a> {
|
pub struct Scope<'a> {
|
||||||
|
@ -8,7 +8,7 @@ version = "0.1.0"
|
|||||||
path = "src/rpc.rs"
|
path = "src/rpc.rs"
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
test-support = []
|
test-support = ["gpui"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
@ -25,6 +25,7 @@ rsa = "0.4"
|
|||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
smol-timeout = "0.6"
|
smol-timeout = "0.6"
|
||||||
zstd = "0.9"
|
zstd = "0.9"
|
||||||
|
gpui = { path = "../gpui", features = ["test-support"], optional = true }
|
||||||
|
|
||||||
[build-dependencies]
|
[build-dependencies]
|
||||||
prost-build = "0.8"
|
prost-build = "0.8"
|
||||||
|
@ -34,12 +34,14 @@ impl Connection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(any(test, feature = "test-support"))]
|
#[cfg(any(test, feature = "test-support"))]
|
||||||
pub fn in_memory() -> (Self, Self, postage::watch::Sender<Option<()>>) {
|
pub fn in_memory(
|
||||||
|
executor: std::sync::Arc<gpui::executor::Background>,
|
||||||
|
) -> (Self, Self, postage::watch::Sender<Option<()>>) {
|
||||||
let (kill_tx, mut kill_rx) = postage::watch::channel_with(None);
|
let (kill_tx, mut kill_rx) = postage::watch::channel_with(None);
|
||||||
postage::stream::Stream::try_recv(&mut kill_rx).unwrap();
|
postage::stream::Stream::try_recv(&mut kill_rx).unwrap();
|
||||||
|
|
||||||
let (a_tx, a_rx) = Self::channel(kill_rx.clone());
|
let (a_tx, a_rx) = Self::channel(kill_rx.clone(), executor.clone());
|
||||||
let (b_tx, b_rx) = Self::channel(kill_rx);
|
let (b_tx, b_rx) = Self::channel(kill_rx, executor);
|
||||||
(
|
(
|
||||||
Self { tx: a_tx, rx: b_rx },
|
Self { tx: a_tx, rx: b_rx },
|
||||||
Self { tx: b_tx, rx: a_rx },
|
Self { tx: b_tx, rx: a_rx },
|
||||||
@ -50,11 +52,12 @@ impl Connection {
|
|||||||
#[cfg(any(test, feature = "test-support"))]
|
#[cfg(any(test, feature = "test-support"))]
|
||||||
fn channel(
|
fn channel(
|
||||||
kill_rx: postage::watch::Receiver<Option<()>>,
|
kill_rx: postage::watch::Receiver<Option<()>>,
|
||||||
|
executor: std::sync::Arc<gpui::executor::Background>,
|
||||||
) -> (
|
) -> (
|
||||||
Box<dyn Send + Unpin + futures::Sink<WebSocketMessage, Error = WebSocketError>>,
|
Box<dyn Send + Unpin + futures::Sink<WebSocketMessage, Error = WebSocketError>>,
|
||||||
Box<dyn Send + Unpin + futures::Stream<Item = Result<WebSocketMessage, WebSocketError>>>,
|
Box<dyn Send + Unpin + futures::Stream<Item = Result<WebSocketMessage, WebSocketError>>>,
|
||||||
) {
|
) {
|
||||||
use futures::{future, SinkExt as _};
|
use futures::SinkExt as _;
|
||||||
use io::{Error, ErrorKind};
|
use io::{Error, ErrorKind};
|
||||||
|
|
||||||
let (tx, rx) = mpsc::unbounded::<WebSocketMessage>();
|
let (tx, rx) = mpsc::unbounded::<WebSocketMessage>();
|
||||||
@ -62,26 +65,39 @@ impl Connection {
|
|||||||
.sink_map_err(|e| WebSocketError::from(Error::new(ErrorKind::Other, e)))
|
.sink_map_err(|e| WebSocketError::from(Error::new(ErrorKind::Other, e)))
|
||||||
.with({
|
.with({
|
||||||
let kill_rx = kill_rx.clone();
|
let kill_rx = kill_rx.clone();
|
||||||
|
let executor = executor.clone();
|
||||||
move |msg| {
|
move |msg| {
|
||||||
if kill_rx.borrow().is_none() {
|
let kill_rx = kill_rx.clone();
|
||||||
future::ready(Ok(msg))
|
let executor = executor.clone();
|
||||||
} else {
|
Box::pin(async move {
|
||||||
future::ready(Err(Error::new(ErrorKind::Other, "connection killed").into()))
|
executor.simulate_random_delay().await;
|
||||||
}
|
if kill_rx.borrow().is_none() {
|
||||||
|
Ok(msg)
|
||||||
|
} else {
|
||||||
|
Err(Error::new(ErrorKind::Other, "connection killed").into())
|
||||||
|
}
|
||||||
|
})
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
let rx = rx.then(move |msg| {
|
||||||
|
let executor = executor.clone();
|
||||||
|
Box::pin(async move {
|
||||||
|
executor.simulate_random_delay().await;
|
||||||
|
msg
|
||||||
|
})
|
||||||
|
});
|
||||||
let rx = KillableReceiver { kill_rx, rx };
|
let rx = KillableReceiver { kill_rx, rx };
|
||||||
|
|
||||||
(Box::new(tx), Box::new(rx))
|
(Box::new(tx), Box::new(rx))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
struct KillableReceiver {
|
struct KillableReceiver<S> {
|
||||||
rx: mpsc::UnboundedReceiver<WebSocketMessage>,
|
rx: S,
|
||||||
kill_rx: postage::watch::Receiver<Option<()>>,
|
kill_rx: postage::watch::Receiver<Option<()>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Stream for KillableReceiver {
|
impl<S: Unpin + Stream<Item = WebSocketMessage>> Stream for KillableReceiver<S> {
|
||||||
type Item = Result<WebSocketMessage, WebSocketError>;
|
type Item = Result<WebSocketMessage, WebSocketError>;
|
||||||
|
|
||||||
fn poll_next(
|
fn poll_next(
|
||||||
|
@ -353,12 +353,14 @@ mod tests {
|
|||||||
let client1 = Peer::new();
|
let client1 = Peer::new();
|
||||||
let client2 = Peer::new();
|
let client2 = Peer::new();
|
||||||
|
|
||||||
let (client1_to_server_conn, server_to_client_1_conn, _) = Connection::in_memory();
|
let (client1_to_server_conn, server_to_client_1_conn, _) =
|
||||||
|
Connection::in_memory(cx.background());
|
||||||
let (client1_conn_id, io_task1, client1_incoming) =
|
let (client1_conn_id, io_task1, client1_incoming) =
|
||||||
client1.add_connection(client1_to_server_conn).await;
|
client1.add_connection(client1_to_server_conn).await;
|
||||||
let (_, io_task2, server_incoming1) = server.add_connection(server_to_client_1_conn).await;
|
let (_, io_task2, server_incoming1) = server.add_connection(server_to_client_1_conn).await;
|
||||||
|
|
||||||
let (client2_to_server_conn, server_to_client_2_conn, _) = Connection::in_memory();
|
let (client2_to_server_conn, server_to_client_2_conn, _) =
|
||||||
|
Connection::in_memory(cx.background());
|
||||||
let (client2_conn_id, io_task3, client2_incoming) =
|
let (client2_conn_id, io_task3, client2_incoming) =
|
||||||
client2.add_connection(client2_to_server_conn).await;
|
client2.add_connection(client2_to_server_conn).await;
|
||||||
let (_, io_task4, server_incoming2) = server.add_connection(server_to_client_2_conn).await;
|
let (_, io_task4, server_incoming2) = server.add_connection(server_to_client_2_conn).await;
|
||||||
@ -489,7 +491,8 @@ mod tests {
|
|||||||
let server = Peer::new();
|
let server = Peer::new();
|
||||||
let client = Peer::new();
|
let client = Peer::new();
|
||||||
|
|
||||||
let (client_to_server_conn, server_to_client_conn, _) = Connection::in_memory();
|
let (client_to_server_conn, server_to_client_conn, _) =
|
||||||
|
Connection::in_memory(cx.background());
|
||||||
let (client_to_server_conn_id, io_task1, mut client_incoming) =
|
let (client_to_server_conn_id, io_task1, mut client_incoming) =
|
||||||
client.add_connection(client_to_server_conn).await;
|
client.add_connection(client_to_server_conn).await;
|
||||||
let (server_to_client_conn_id, io_task2, mut server_incoming) =
|
let (server_to_client_conn_id, io_task2, mut server_incoming) =
|
||||||
@ -589,7 +592,7 @@ mod tests {
|
|||||||
async fn test_disconnect(cx: TestAppContext) {
|
async fn test_disconnect(cx: TestAppContext) {
|
||||||
let executor = cx.foreground();
|
let executor = cx.foreground();
|
||||||
|
|
||||||
let (client_conn, mut server_conn, _) = Connection::in_memory();
|
let (client_conn, mut server_conn, _) = Connection::in_memory(cx.background());
|
||||||
|
|
||||||
let client = Peer::new();
|
let client = Peer::new();
|
||||||
let (connection_id, io_handler, mut incoming) = client.add_connection(client_conn).await;
|
let (connection_id, io_handler, mut incoming) = client.add_connection(client_conn).await;
|
||||||
@ -623,7 +626,7 @@ mod tests {
|
|||||||
#[gpui::test(iterations = 10)]
|
#[gpui::test(iterations = 10)]
|
||||||
async fn test_io_error(cx: TestAppContext) {
|
async fn test_io_error(cx: TestAppContext) {
|
||||||
let executor = cx.foreground();
|
let executor = cx.foreground();
|
||||||
let (client_conn, mut server_conn, _) = Connection::in_memory();
|
let (client_conn, mut server_conn, _) = Connection::in_memory(cx.background());
|
||||||
|
|
||||||
let client = Peer::new();
|
let client = Peer::new();
|
||||||
let (connection_id, io_handler, mut incoming) = client.add_connection(client_conn).await;
|
let (connection_id, io_handler, mut incoming) = client.add_connection(client_conn).await;
|
||||||
|
@ -3242,7 +3242,8 @@ mod tests {
|
|||||||
"server is forbidding connections"
|
"server is forbidding connections"
|
||||||
)))
|
)))
|
||||||
} else {
|
} else {
|
||||||
let (client_conn, server_conn, kill_conn) = Connection::in_memory();
|
let (client_conn, server_conn, kill_conn) =
|
||||||
|
Connection::in_memory(cx.background());
|
||||||
connection_killers.lock().insert(user_id, kill_conn);
|
connection_killers.lock().insert(user_id, kill_conn);
|
||||||
cx.background()
|
cx.background()
|
||||||
.spawn(server.handle_connection(
|
.spawn(server.handle_connection(
|
||||||
|
Loading…
Reference in New Issue
Block a user