aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authora-kenji <aks.kenji@protonmail.com>2021-06-30 19:42:21 +0200
committera-kenji <aks.kenji@protonmail.com>2021-06-30 19:45:15 +0200
commit8086765e509942d5cd7a3f0818f6cef6918ec7a6 (patch)
tree6a6b6f9552c23b7882412ac669d977e17961befe
parentMerge branch 'main' of https://github.com/zellij-org/zellij into modularize-s... (diff)
downloadsl0ppij-8086765e509942d5cd7a3f0818f6cef6918ec7a6.tar.gz
sl0ppij-8086765e509942d5cd7a3f0818f6cef6918ec7a6.tar.xz
sl0ppij-8086765e509942d5cd7a3f0818f6cef6918ec7a6.zip
fixup! Fix merged tests
-rw-r--r--zellij-server/src/unit/screen_tests.rs5
-rw-r--r--zellij-server/src/unit/tab_tests.rs4
2 files changed, 4 insertions, 5 deletions
diff --git a/zellij-server/src/unit/screen_tests.rs b/zellij-server/src/unit/screen_tests.rs
index da52c585..885cb3d1 100644
--- a/zellij-server/src/unit/screen_tests.rs
+++ b/zellij-server/src/unit/screen_tests.rs
@@ -6,10 +6,9 @@ use crate::{
SessionState,
};
use std::sync::{Arc, RwLock};
-use zellij_utils::pane_size::PositionAndSize;
+use zellij_utils::{input::command::TerminalAction, pane_size::PositionAndSize};
use std::os::unix::io::RawFd;
-use std::path::PathBuf;
use zellij_utils::ipc::ClientAttributes;
use zellij_utils::nix;
@@ -27,7 +26,7 @@ impl ServerOsApi for FakeInputOutput {
fn set_terminal_size_using_fd(&self, _fd: RawFd, _cols: u16, _rows: u16) {
// noop
}
- fn spawn_terminal(&self, _file_to_open: Option<PathBuf>) -> (RawFd, Pid) {
+ fn spawn_terminal(&self, _file_to_open: Option<TerminalAction>) -> (RawFd, Pid) {
unimplemented!()
}
fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> {
diff --git a/zellij-server/src/unit/tab_tests.rs b/zellij-server/src/unit/tab_tests.rs
index 87c3be71..f4c7493e 100644
--- a/zellij-server/src/unit/tab_tests.rs
+++ b/zellij-server/src/unit/tab_tests.rs
@@ -10,12 +10,12 @@ use std::sync::{Arc, RwLock};
use zellij_utils::pane_size::PositionAndSize;
use std::os::unix::io::RawFd;
-use std::path::PathBuf;
use zellij_utils::nix;
use zellij_utils::{
errors::ErrorContext,
+ input::command::TerminalAction,
interprocess::local_socket::LocalSocketStream,
ipc::{ClientToServerMsg, ServerToClientMsg},
};
@@ -26,7 +26,7 @@ impl ServerOsApi for FakeInputOutput {
fn set_terminal_size_using_fd(&self, _fd: RawFd, _cols: u16, _rows: u16) {
// noop
}
- fn spawn_terminal(&self, _file_to_open: Option<PathBuf>) -> (RawFd, Pid) {
+ fn spawn_terminal(&self, _file_to_open: Option<TerminalAction>) -> (RawFd, Pid) {
unimplemented!()
}
fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> {