From ed024ceb541a9f6bcf38ca4a429dd2c6a5493876 Mon Sep 17 00:00:00 2001 From: sharkdp Date: Sat, 4 Apr 2020 13:39:45 +0200 Subject: [PATCH] Remove code duplication, add feature gate --- tests/testenv/mod.rs | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/tests/testenv/mod.rs b/tests/testenv/mod.rs index e2581e0..a4414a8 100644 --- a/tests/testenv/mod.rs +++ b/tests/testenv/mod.rs @@ -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>(&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)