public/galaxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

first pass of merging in warp (doesn't build)

Browse Source
This commit is contained in:
Ryan Ward
2026-07-01 16:08:58 -05:00
parent 2f64909469
commit 4770ac06b5
3662 changed files with 414574 additions and 89772 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/integration/src/test/ctrl_d.rs
+14 -16
View File
@@ -1,21 +1,19 @@
//! Integration tests for CTRL-D / EOT behaviour.
use galaxy::{
integration_testing::{
step::new_step_with_default_assertions,
terminal::{
assert_active_block_command_for_single_terminal_in_tab, assert_bootstrapping_stage,
assert_no_block_executing, assert_terminal_bootstrapped,
execute_python_interpreter_in_tab, util::current_shell_starter_and_version,
wait_until_bootstrapped_single_pane_for_tab, PYTHON_PROMPT_READY,
},
view_getters::assert_no_views_of_type,
},
pane_group::PaneGroup,
terminal::{model::bootstrap::BootstrapStage, shell::ShellType, TerminalView},
workspace::Workspace,
use warp::integration_testing::step::new_step_with_default_assertions;
use warp::integration_testing::terminal::util::current_shell_starter_and_version;
use warp::integration_testing::terminal::{
assert_active_block_command_for_single_terminal_in_tab, assert_bootstrapping_stage,
assert_no_block_executing, assert_terminal_bootstrapped, execute_python_interpreter_in_tab,
wait_until_bootstrapped_single_pane_for_tab, PYTHON_PROMPT_READY,
};
use galaxyui::integration::TestStep;
use warp::integration_testing::view_getters::assert_no_views_of_type;
use warp::pane_group::PaneGroup;
use warp::terminal::model::bootstrap::BootstrapStage;
use warp::terminal::shell::ShellType;
use warp::terminal::TerminalView;
use warp::workspace::Workspace;
use galaxyui_core::integration::TestStep;
use super::{new_builder, Builder};
use crate::util::write_all_rc_files_for_test;
@@ -101,7 +99,7 @@ pub fn test_ctrl_d_during_bootstrapping_exits_shell_upon_completion() -> Builder
// is to exit upon completion.
// However, this differs on Linux where the common behaviour is to
// ignore ctrl-d (and the corresponding EOF) while bootstrapping.
let final_assertion = if cfg!(target_os = "linux") {
let final_assertion = if cfg!(any(target_os = "linux", target_os = "freebsd")) {
assert_terminal_bootstrapped(0, 0)
} else {
// TODO: figure out what the right behaviour is on windows.