utilities/fd
utilities/fd
1
0
Fork 0
mirror of https://github.com/sharkdp/fd synced 2024-07-20 02:24:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove code duplication, add feature gate

Browse source
This commit is contained in:
sharkdp 2020-04-04 13:39:45 +02:00 committed by David Peter
parent 6c9e743d43
commit ed024ceb54
1 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
tests/testenv/mod.rs
View file

@ -209,9 +209,11 @@ impl TestEnv {
}
/// Similar to assert_output, but able to handle non-utf8 output
#[cfg(all(unix, not(target_os = "macos")))]
pub fn assert_output_raw(&self, args: &[&str], expected: &[u8]) {
let actual = self.raw_output_subdirectory(".", args);
assert_eq!(expected, actual.as_ref());
let output = self.assert_success_and_get_output(".", args);
assert_eq!(expected, &output.stdout[..]);
}
/// Assert that calling *fd* in the specified path under the root working directory,
@ -238,23 +240,6 @@ impl TestEnv {
}
}
fn raw_output_subdirectory<P: AsRef<Path>>(&self, path: P, args: &[&str]) -> Box<[u8]> {
// Setup *fd* command.
let mut cmd = process::Command::new(&self.fd_exe);
cmd.current_dir(self.temp_dir.path().join(path));
cmd.args(args);
// Run *fd*.
let output = cmd.output().expect("fd output");
// Check for exit status.
if !output.status.success() {
panic!(format_exit_error(args, &output));
}
output.stdout.into_boxed_slice()
}
/// Assert that calling *fd* with the specified arguments produces the expected error.
pub fn assert_error(&self, args: &[&str], expected: &str) {
self.assert_error_subdirectory(".", args, expected)