1 files changed, 7 insertions, 13 deletions
diff --git a/tests/cli_wrapper.rs b/tests/cli_wrapper.rs
index c1bf27c0..d3f67780 100644
--- a/tests/cli_wrapper.rs
+++ b/tests/cli_wrapper.rs
@@ -1756,26 +1756,20 @@ fn server_stop_command_shuts_down_running_server() {
         "server stop should not print stdout: {}",
         String::from_utf8_lossy(&stopped.stdout)
     );
-
-    let pid = herdr.child.process_id();
-    let exit_status = herdr.child.wait().unwrap();
-    unregister_spawned_herdr_pid(pid);
-    assert!(exit_status.success(), "server stop should exit cleanly");
-
-    let deadline = Instant::now() + Duration::from_secs(3);
-    while Instant::now() < deadline && (socket_path.exists() || client_socket.exists()) {
-        thread::sleep(Duration::from_millis(25));
-    }
-
     assert!(
         !socket_path.exists() || UnixStream::connect(&socket_path).is_err(),
-        "api socket should be removed or stale after server stop"
+        "api socket should be removed or stale before server stop returns"
     );
     assert!(
         !client_socket.exists() || UnixStream::connect(&client_socket).is_err(),
-        "client socket should be removed or stale after server stop"
+        "client socket should be removed or stale before server stop returns"
     );
 
+    let pid = herdr.child.process_id();
+    let exit_status = herdr.child.wait().unwrap();
+    unregister_spawned_herdr_pid(pid);
+    assert!(exit_status.success(), "server stop should exit cleanly");
+
     cleanup_spawned_herdr(herdr, base);
 }