Fix semantic conflicts from rebase

Author: lionel-

crates/ark/tests/kernel-hooks-session.rs

@@ -15,8 +15,6 @@ fn execute(frontend: &DummyArkFrontend, comm_id: &str, code: &str) {
     frontend.send_execute_request(code, ExecuteRequestOptions::default());
     frontend.recv_iopub_busy();
     frontend.recv_iopub_execute_input();
-    frontend.recv_ui_busy(comm_id, true);
-    frontend.recv_ui_busy(comm_id, false);
     frontend.recv_ui_prompt_state(comm_id);
     frontend.recv_iopub_idle();
     frontend.recv_shell_execute_reply();

crates/ark/tests/kernel-notebook-data-explorer.rs

@@ -8,29 +8,6 @@
 use amalthea::fixtures::dummy_frontend::ExecuteRequestOptions;
 use ark_test::DummyArkPositronNotebook;
 
-/// Drain the UI comm messages that arrive during execution (busy=true,
-/// busy=false, prompt_state). These are CommMsg messages on the UI comm's
-/// channel that interleave with the execute result on IOPub.
-fn drain_ui_comm_msgs(frontend: &DummyArkPositronNotebook, ui_comm_id: &str) {
-    // busy=true
-    let msg = frontend.recv_iopub_comm_msg();
-    assert_eq!(msg.comm_id, ui_comm_id);
-    assert_eq!(msg.data["method"], "busy");
-    assert_eq!(msg.data["params"]["busy"], true);
-
-    // busy=false
-    let msg = frontend.recv_iopub_comm_msg();
-    assert_eq!(msg.comm_id, ui_comm_id);
-    assert_eq!(msg.data["method"], "busy");
-    assert_eq!(msg.data["params"]["busy"], false);
-}
-
-fn drain_ui_comm_prompt_state(frontend: &DummyArkPositronNotebook, ui_comm_id: &str) {
-    let msg = frontend.recv_iopub_comm_msg();
-    assert_eq!(msg.comm_id, ui_comm_id);
-    assert_eq!(msg.data["method"], "prompt_state");
-}
-
 #[test]
 fn test_notebook_inline_data_explorer() {
     let frontend = DummyArkPositronNotebook::lock();
@@ -43,8 +20,12 @@ fn test_notebook_inline_data_explorer() {
     frontend.recv_iopub_busy();
     frontend.recv_iopub_execute_input();
 
-    // Drain UI comm busy events
-    drain_ui_comm_msgs(&frontend, &ui_comm_id);
+    // The comm_open for the inline data explorer now arrives during execution
+    // (before the execute result) because comm_open_backend blocks until Shell
+    // has published it on IOPub.
+    let comm_open = frontend.recv_iopub_comm_open();
+    assert_eq!(comm_open.target_name, "positron.dataExplorer");
+    assert_eq!(comm_open.data["inline_only"], true);
 
     let result_data = frontend.recv_iopub_execute_result_data();
 
@@ -63,18 +44,14 @@ fn test_notebook_inline_data_explorer() {
     assert!(de_data["comm_id"].as_str().is_some());
     assert!(de_data["title"].as_str().is_some());
 
+    // The comm_id in the MIME payload must match the comm_open
+    assert_eq!(comm_open.comm_id, de_data["comm_id"].as_str().unwrap());
+
     // prompt_state arrives after execute_result
-    drain_ui_comm_prompt_state(&frontend, &ui_comm_id);
+    frontend.recv_ui_prompt_state(&ui_comm_id);
 
     frontend.recv_iopub_idle();
     frontend.recv_shell_execute_reply();
-
-    // The comm_open for the inline data explorer arrives after Idle
-    // (it goes through Shell's comm event channel)
-    let comm_open = frontend.recv_iopub_comm_open();
-    assert_eq!(comm_open.target_name, "positron.dataExplorer");
-    assert_eq!(comm_open.data["inline_only"], true);
-    assert_eq!(comm_open.comm_id, de_data["comm_id"].as_str().unwrap());
 }
 
 #[test]
@@ -86,15 +63,13 @@ fn test_notebook_no_inline_data_explorer_for_non_data_frame() {
     frontend.recv_iopub_busy();
     frontend.recv_iopub_execute_input();
 
-    drain_ui_comm_msgs(&frontend, &ui_comm_id);
-
     let result_data = frontend.recv_iopub_execute_result_data();
 
     // Should have text/plain but NOT the data explorer MIME type
     assert!(result_data.contains_key("text/plain"));
     assert!(!result_data.contains_key("application/vnd.positron.dataExplorer+json"));
 
-    drain_ui_comm_prompt_state(&frontend, &ui_comm_id);
+    frontend.recv_ui_prompt_state(&ui_comm_id);
 
     frontend.recv_iopub_idle();
     frontend.recv_shell_execute_reply();