Skip to content

Commit a6f392c

Browse files
committed
Move is_installed() to ark_test
It runs R code, so is very R specific
1 parent 1a31016 commit a6f392c

File tree

2 files changed

+25
-25
lines changed

2 files changed

+25
-25
lines changed

crates/amalthea/src/fixtures/dummy_frontend.rs

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -606,31 +606,6 @@ impl DummyFrontend {
606606
(data.content.comm_id, data.content.target_name, data.content.data)
607607
})
608608
}
609-
610-
pub fn is_installed(&self, package: &str) -> bool {
611-
let code = format!(".ps.is_installed('{package}')");
612-
self.send_execute_request(&code, ExecuteRequestOptions::default());
613-
self.recv_iopub_busy();
614-
615-
let input = self.recv_iopub_execute_input();
616-
assert_eq!(input.code, code);
617-
618-
let result = self.recv_iopub_execute_result();
619-
620-
let out = if result == "[1] TRUE" {
621-
true
622-
} else if result == "[1] FALSE" {
623-
false
624-
} else {
625-
panic!("Expected `TRUE` or `FALSE`, got '{result}'.");
626-
};
627-
628-
self.recv_iopub_idle();
629-
630-
assert_eq!(self.recv_shell_execute_reply(), input.execution_count);
631-
632-
out
633-
}
634609
}
635610

636611
impl Default for ExecuteRequestOptions {

crates/ark_test/src/dummy_frontend.rs

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,6 +1335,31 @@ impl DummyArkFrontend {
13351335
Some(content.to_string())
13361336
}
13371337
}
1338+
1339+
pub fn is_installed(&self, package: &str) -> bool {
1340+
let code = format!(".ps.is_installed('{package}')");
1341+
self.send_execute_request(&code, ExecuteRequestOptions::default());
1342+
self.recv_iopub_busy();
1343+
1344+
let input = self.recv_iopub_execute_input();
1345+
assert_eq!(input.code, code);
1346+
1347+
let result = self.recv_iopub_execute_result();
1348+
1349+
let out = if result == "[1] TRUE" {
1350+
true
1351+
} else if result == "[1] FALSE" {
1352+
false
1353+
} else {
1354+
panic!("Expected `TRUE` or `FALSE`, got '{result}'.");
1355+
};
1356+
1357+
self.recv_iopub_idle();
1358+
1359+
assert_eq!(self.recv_shell_execute_reply(), input.execution_count);
1360+
1361+
out
1362+
}
13381363
}
13391364

13401365
/// Result of sourcing a file via `send_source()`.

0 commit comments

Comments
 (0)