diff options
Diffstat (limited to 'tests/util/server/src')
-rw-r--r-- | tests/util/server/src/builders.rs | 26 | ||||
-rw-r--r-- | tests/util/server/src/lib.rs | 4 |
2 files changed, 6 insertions, 24 deletions
diff --git a/tests/util/server/src/builders.rs b/tests/util/server/src/builders.rs index d8c209dd7..eb2014b8d 100644 --- a/tests/util/server/src/builders.rs +++ b/tests/util/server/src/builders.rs @@ -357,7 +357,6 @@ pub struct TestCommandBuilder { args_text: String, args_vec: Vec<String>, split_output: bool, - skip_strip_ansi: bool, } impl TestCommandBuilder { @@ -369,7 +368,6 @@ impl TestCommandBuilder { stderr: None, stdin_text: None, split_output: false, - skip_strip_ansi: false, cwd: None, envs: Default::default(), envs_remove: Default::default(), @@ -453,11 +451,6 @@ impl TestCommandBuilder { self } - pub fn skip_strip_ansi(mut self) -> Self { - self.skip_strip_ansi = true; - self - } - pub fn stdin<T: Into<Stdio>>(mut self, cfg: T) -> Self { self.stdin = Some(StdioContainer::new(cfg.into())); self @@ -581,14 +574,8 @@ impl TestCommandBuilder { output } - fn sanitize_output( - mut text: String, - args: &[OsString], - skip_strip_ansi: bool, - ) -> String { - if !skip_strip_ansi { - text = strip_ansi_codes(&text).to_string(); - } + fn sanitize_output(text: String, args: &[OsString]) -> String { + let mut text = strip_ansi_codes(&text).to_string(); // deno test's output capturing flushes with a zero-width space in order to // synchronize the output pipes. Occasionally this zero width space // might end up in the output so strip it from the output comparison here. @@ -635,15 +622,14 @@ impl TestCommandBuilder { // and dropping it closes them. drop(command); - let combined = combined_reader.map(|pipe| { - sanitize_output(read_pipe_to_string(pipe), &args, self.skip_strip_ansi) - }); + let combined = combined_reader + .map(|pipe| sanitize_output(read_pipe_to_string(pipe), &args)); let status = process.wait().unwrap(); let std_out_err = std_out_err_handle.map(|(stdout, stderr)| { ( - sanitize_output(stdout.join().unwrap(), &args, self.skip_strip_ansi), - sanitize_output(stderr.join().unwrap(), &args, self.skip_strip_ansi), + sanitize_output(stdout.join().unwrap(), &args), + sanitize_output(stderr.join().unwrap(), &args), ) }); let exit_code = status.code(); diff --git a/tests/util/server/src/lib.rs b/tests/util/server/src/lib.rs index 65dfe61ec..ead05641d 100644 --- a/tests/util/server/src/lib.rs +++ b/tests/util/server/src/lib.rs @@ -511,7 +511,6 @@ pub struct CheckOutputIntegrationTest<'a> { pub http_server: bool, pub envs: Vec<(String, String)>, pub env_clear: bool, - pub skip_strip_ansi: bool, pub temp_cwd: bool, /// Copies the files at the specified directory in the "testdata" directory /// to the temp folder and runs the test from there. This is useful when @@ -553,9 +552,6 @@ impl<'a> CheckOutputIntegrationTest<'a> { if self.env_clear { command_builder = command_builder.env_clear(); } - if self.skip_strip_ansi { - command_builder = command_builder.skip_strip_ansi(); - } if let Some(cwd) = &self.cwd { command_builder = command_builder.current_dir(cwd); } |