From b9d46366ed0f2b97d281b2896f6cc96bdd59c1b2 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Tue, 21 Sep 2021 16:20:20 +0200
Subject: [PATCH] Fix more failing/hanging unit tests

---
 zed/src/channel.rs  | 30 +++++++++++++++---------------
 zed/src/worktree.rs | 24 ++++++++++++++++--------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/zed/src/channel.rs b/zed/src/channel.rs
index f042a2e5088ecca669ffad917b9789eecd1e3084..f0e7a90c9aed29367df60a388febdac0f47b130e 100644
--- a/zed/src/channel.rs
+++ b/zed/src/channel.rs
@@ -615,21 +615,6 @@ mod tests {
         let channel_list = cx.add_model(|cx| ChannelList::new(user_store, client.clone(), cx));
         channel_list.read_with(&cx, |list, _| assert_eq!(list.available_channels(), None));
 
-        let get_users = server.receive::<proto::GetUsers>().await.unwrap();
-        assert_eq!(get_users.payload.user_ids, vec![5]);
-        server
-            .respond(
-                get_users.receipt(),
-                proto::GetUsersResponse {
-                    users: vec![proto::User {
-                        id: 5,
-                        github_login: "nathansobo".into(),
-                        avatar_url: "http://avatar.com/nathansobo".into(),
-                    }],
-                },
-            )
-            .await;
-
         // Get the available channels.
         let get_channels = server.receive::<proto::GetChannels>().await.unwrap();
         server
@@ -654,6 +639,21 @@ mod tests {
             )
         });
 
+        let get_users = server.receive::<proto::GetUsers>().await.unwrap();
+        assert_eq!(get_users.payload.user_ids, vec![5]);
+        server
+            .respond(
+                get_users.receipt(),
+                proto::GetUsersResponse {
+                    users: vec![proto::User {
+                        id: 5,
+                        github_login: "nathansobo".into(),
+                        avatar_url: "http://avatar.com/nathansobo".into(),
+                    }],
+                },
+            )
+            .await;
+
         // Join a channel and populate its existing messages.
         let channel = channel_list
             .update(&mut cx, |list, cx| {
diff --git a/zed/src/worktree.rs b/zed/src/worktree.rs
index 7c766bc0d7c8abbf044f86cc2821f70d979fce73..bbf8381784a51938d7e3dc6c997fe0ffb3cc02f1 100644
--- a/zed/src/worktree.rs
+++ b/zed/src/worktree.rs
@@ -2806,8 +2806,11 @@ mod tests {
             }
         }));
 
+        let user_id = 5;
+        let mut client = rpc::Client::new();
+        let server = FakeServer::for_client(user_id, &mut client, &cx).await;
         let tree = Worktree::open_local(
-            rpc::Client::new(),
+            client,
             dir.path(),
             Arc::new(RealFs),
             Default::default(),
@@ -2844,15 +2847,20 @@ mod tests {
         // Create a remote copy of this worktree.
         let initial_snapshot = tree.read_with(&cx, |tree, _| tree.snapshot());
         let worktree_id = 1;
-        let share_request = tree
-            .update(&mut cx, |tree, cx| {
-                tree.as_local().unwrap().share_request(cx)
-            })
-            .await
-            .unwrap();
+        let share_request = tree.update(&mut cx, |tree, cx| {
+            tree.as_local().unwrap().share_request(cx)
+        });
+        let open_worktree = server.receive::<proto::OpenWorktree>().await.unwrap();
+        server
+            .respond(
+                open_worktree.receipt(),
+                proto::OpenWorktreeResponse { worktree_id: 1 },
+            )
+            .await;
+
         let remote = Worktree::remote(
             proto::JoinWorktreeResponse {
-                worktree: share_request.worktree,
+                worktree: share_request.await.unwrap().worktree,
                 replica_id: 1,
                 peers: Vec::new(),
             },