pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixup! Fix merged tests

Browse source
This commit is contained in:
a-kenji 2021-06-30 19:42:21 +02:00
parent 242e41d67f
commit 8086765e50
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
zellij-server/src/unit/screen_tests.rs
View file

@ -6,10 +6,9 @@ use crate::{
SessionState, SessionState,
}; };
use std::sync::{Arc, RwLock}; 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::os::unix::io::RawFd;
use std::path::PathBuf;
use zellij_utils::ipc::ClientAttributes; use zellij_utils::ipc::ClientAttributes;
use zellij_utils::nix; 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) { fn set_terminal_size_using_fd(&self, _fd: RawFd, _cols: u16, _rows: u16) {
// noop // noop
} }
fn spawn_terminal(&self, _file_to_open: Option<PathBuf>) -> (RawFd, Pid) { fn spawn_terminal(&self, _file_to_open: Option<TerminalAction>) -> (RawFd, Pid) {
unimplemented!() unimplemented!()
} }
fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> { fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> {

4
zellij-server/src/unit/tab_tests.rs
View file

@ -10,12 +10,12 @@ use std::sync::{Arc, RwLock};
use zellij_utils::pane_size::PositionAndSize; use zellij_utils::pane_size::PositionAndSize;
use std::os::unix::io::RawFd; use std::os::unix::io::RawFd;
use std::path::PathBuf;
use zellij_utils::nix; use zellij_utils::nix;
use zellij_utils::{ use zellij_utils::{
errors::ErrorContext, errors::ErrorContext,
input::command::TerminalAction,
interprocess::local_socket::LocalSocketStream, interprocess::local_socket::LocalSocketStream,
ipc::{ClientToServerMsg, ServerToClientMsg}, ipc::{ClientToServerMsg, ServerToClientMsg},
}; };
@ -26,7 +26,7 @@ impl ServerOsApi for FakeInputOutput {
fn set_terminal_size_using_fd(&self, _fd: RawFd, _cols: u16, _rows: u16) { fn set_terminal_size_using_fd(&self, _fd: RawFd, _cols: u16, _rows: u16) {
// noop // noop
} }
fn spawn_terminal(&self, _file_to_open: Option<PathBuf>) -> (RawFd, Pid) { fn spawn_terminal(&self, _file_to_open: Option<TerminalAction>) -> (RawFd, Pid) {
unimplemented!() unimplemented!()
} }
fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> { fn read_from_tty_stdout(&self, _fd: RawFd, _buf: &mut [u8]) -> Result<usize, nix::Error> {