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

fix(style): fix clippy lints in remote_runner

Browse source
This commit is contained in:
Thomas Linford 2021-10-23 23:28:32 +02:00 • committed by GitHub
parent e0d7212c2a
commit 0c96347083
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/tests/e2e/remote_runner.rs
View file

@ -271,7 +271,7 @@ impl RemoteRunner {
}; };
let terminal_output = TerminalPane::new(0, pane_geom, Palette::default(), 0); // 0 is the pane index let terminal_output = TerminalPane::new(0, pane_geom, Palette::default(), 0); // 0 is the pane index
setup_remote_environment(&mut channel, win_size); setup_remote_environment(&mut channel, win_size);
start_zellij_in_session(&mut channel, &session_name); start_zellij_in_session(&mut channel, session_name);
RemoteRunner { RemoteRunner {
steps: vec![], steps: vec![],
channel, channel,
@ -310,7 +310,7 @@ impl RemoteRunner {
}; };
let terminal_output = TerminalPane::new(0, pane_geom, Palette::default(), 0); // 0 is the pane index let terminal_output = TerminalPane::new(0, pane_geom, Palette::default(), 0); // 0 is the pane index
setup_remote_environment(&mut channel, win_size); setup_remote_environment(&mut channel, win_size);
attach_to_existing_session(&mut channel, &session_name); attach_to_existing_session(&mut channel, session_name);
RemoteRunner { RemoteRunner {
steps: vec![], steps: vec![],
channel, channel,
@ -472,38 +472,35 @@ impl RemoteRunner {
new_runner.retries_left = self.retries_left - 1; new_runner.retries_left = self.retries_left - 1;
new_runner.replace_steps(self.steps.clone()); new_runner.replace_steps(self.steps.clone());
drop(std::mem::replace(self, new_runner)); drop(std::mem::replace(self, new_runner));
self.run_all_steps()
} else if self.without_frames { } else if self.without_frames {
let mut new_runner = RemoteRunner::new_without_frames(self.test_name, self.win_size); let mut new_runner = RemoteRunner::new_without_frames(self.test_name, self.win_size);
new_runner.retries_left = self.retries_left - 1; new_runner.retries_left = self.retries_left - 1;
new_runner.replace_steps(self.steps.clone()); new_runner.replace_steps(self.steps.clone());
drop(std::mem::replace(self, new_runner)); drop(std::mem::replace(self, new_runner));
self.run_all_steps()
} else if self.session_name.is_some() { } else if self.session_name.is_some() {
let mut new_runner = if self.attach_to_existing { let mut new_runner = if self.attach_to_existing {
RemoteRunner::new_existing_session( RemoteRunner::new_existing_session(
self.test_name, self.test_name,
self.win_size, self.win_size,
&self.session_name.as_ref().unwrap(), self.session_name.as_ref().unwrap(),
) )
} else { } else {
RemoteRunner::new_with_session_name( RemoteRunner::new_with_session_name(
self.test_name, self.test_name,
self.win_size, self.win_size,
&self.session_name.as_ref().unwrap(), self.session_name.as_ref().unwrap(),
) )
}; };
new_runner.retries_left = self.retries_left - 1; new_runner.retries_left = self.retries_left - 1;
new_runner.replace_steps(self.steps.clone()); new_runner.replace_steps(self.steps.clone());
drop(std::mem::replace(self, new_runner)); drop(std::mem::replace(self, new_runner));
self.run_all_steps()
} else { } else {
let mut new_runner = RemoteRunner::new(self.test_name, self.win_size); let mut new_runner = RemoteRunner::new(self.test_name, self.win_size);
new_runner.retries_left = self.retries_left - 1; new_runner.retries_left = self.retries_left - 1;
new_runner.replace_steps(self.steps.clone()); new_runner.replace_steps(self.steps.clone());
drop(std::mem::replace(self, new_runner)); drop(std::mem::replace(self, new_runner));
self.run_all_steps()
} }
self.run_all_steps()
} }
pub fn run_all_steps(&mut self) -> String { pub fn run_all_steps(&mut self) -> String {
// returns the last snapshot // returns the last snapshot