Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean db pool on drop only if assertions fail or it's the last iteration

Browse source
This commit is contained in:
Antonio Scandurra 2022-02-16 15:07:41 +01:00
parent c3ba8f59ed
commit 38f225b575
4 changed files with 120 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

111
crates/server/src/rpc.rs
View file

@ -1134,14 +1134,18 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_share_project(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_share_project(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
let (window_b, _) = cx_b.add_window(|_| EmptyView);
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
cx_a.foreground().forbid_parking();
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1273,13 +1277,17 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_unshare_project(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_unshare_project(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
cx_a.foreground().forbid_parking();
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1374,13 +1382,14 @@ mod tests {
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
mut cx_c: TestAppContext,
last_iteration: bool,
) {
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
cx_a.foreground().forbid_parking();
// Connect to a server as 3 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
let client_c = server.create_client(&mut cx_c, "user_c").await;
@ -1552,13 +1561,17 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_buffer_conflict_after_save(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_buffer_conflict_after_save(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1640,13 +1653,17 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_buffer_reloading(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_buffer_reloading(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1725,13 +1742,14 @@ mod tests {
async fn test_editing_while_guest_opens_buffer(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1807,13 +1825,14 @@ mod tests {
async fn test_leaving_worktree_while_opening_buffer(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1882,13 +1901,17 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_peer_disconnection(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_peer_disconnection(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -1956,6 +1979,7 @@ mod tests {
async fn test_collaborating_with_diagnostics(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -1977,7 +2001,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2180,6 +2204,7 @@ mod tests {
async fn test_collaborating_with_completion(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -2211,7 +2236,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2382,7 +2407,11 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_formatting_buffer(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_formatting_buffer(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
@ -2403,7 +2432,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2484,7 +2513,11 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_definition(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_definition(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
@ -2520,7 +2553,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2636,6 +2669,7 @@ mod tests {
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
mut rng: StdRng,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -2667,7 +2701,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2745,6 +2779,7 @@ mod tests {
async fn test_collaborating_with_code_actions(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let mut lang_registry = Arc::new(LanguageRegistry::new());
@ -2774,7 +2809,7 @@ mod tests {
)));
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -2983,11 +3018,15 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_basic_chat(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_basic_chat(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
@ -3123,10 +3162,10 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_chat_message_validation(mut cx_a: TestAppContext) {
async fn test_chat_message_validation(mut cx_a: TestAppContext, last_iteration: bool) {
cx_a.foreground().forbid_parking();
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let db = &server.app_state.db;
@ -3183,11 +3222,15 @@ mod tests {
}
#[gpui::test(iterations = 10)]
async fn test_chat_reconnection(mut cx_a: TestAppContext, mut cx_b: TestAppContext) {
async fn test_chat_reconnection(
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
// Connect to a server as 2 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
let mut status_b = client_b.status();
@ -3399,13 +3442,14 @@ mod tests {
mut cx_a: TestAppContext,
mut cx_b: TestAppContext,
mut cx_c: TestAppContext,
last_iteration: bool,
) {
cx_a.foreground().forbid_parking();
let lang_registry = Arc::new(LanguageRegistry::new());
let fs = Arc::new(FakeFs::new(cx_a.background()));
// Connect to a server as 3 clients.
let mut server = TestServer::start(cx_a.foreground()).await;
let mut server = TestServer::start(cx_a.foreground(), last_iteration).await;
let client_a = server.create_client(&mut cx_a, "user_a").await;
let client_b = server.create_client(&mut cx_b, "user_b").await;
let client_c = server.create_client(&mut cx_c, "user_c").await;
@ -3536,8 +3580,8 @@ mod tests {
}
}
#[gpui::test(iterations = 10)]
async fn test_random_collaboration(cx: TestAppContext, rng: StdRng) {
#[gpui::test(iterations = 100)]
async fn test_random_collaboration(cx: TestAppContext, rng: StdRng, last_iteration: bool) {
cx.foreground().forbid_parking();
let max_peers = env::var("MAX_PEERS")
.map(|i| i.parse().expect("invalid `MAX_PEERS` variable"))
@ -3558,7 +3602,7 @@ mod tests {
.await;
let operations = Rc::new(Cell::new(0));
let mut server = TestServer::start(cx.foreground()).await;
let mut server = TestServer::start(cx.foreground(), last_iteration).await;
let mut clients = Vec::new();
let mut next_entity_id = 100000;
@ -3729,8 +3773,9 @@ mod tests {
}
impl TestServer {
async fn start(foreground: Rc<executor::Foreground>) -> Self {
let test_db = TestDb::new();
async fn start(foreground: Rc<executor::Foreground>, clean_db_pool_on_drop: bool) -> Self {
let mut test_db = TestDb::new();
test_db.set_clean_pool_on_drop(clean_db_pool_on_drop);
let app_state = Self::build_app_state(&test_db).await;
let peer = Peer::new();
let notifications = mpsc::channel(128);