Fixes #23788: tests output should be displayed even if not valid utf-8

Normation · Nov 24, 2023 · 84d5f13 · 84d5f13
1 parent d5f5a18
commit 84d5f13
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/policies/rudderc/src/backends/unix/cfengine.rs b/policies/rudderc/src/backends/unix/cfengine.rs
@@ -179,8 +179,8 @@ pub fn cf_agent(
         .env("TMP_DIR", work_dir.path().to_string_lossy().to_string())
         .env("CWD", std::env::current_dir()?)
         .output()?;
-    let stdout = String::from_utf8(cmd.stdout)?;
-    let stderr = String::from_utf8(cmd.stderr)?;
+    let stdout = String::from_utf8_lossy(&cmd.stdout);
+    let stderr = String::from_utf8_lossy(&cmd.stderr);
     if !cmd.status.success() {
         bail!("Failed to run cf-agent:\nstdout: {stdout}\nstderr:{stderr}",);
     } else {

diff --git a/policies/rudderc/src/backends/windows/test.rs b/policies/rudderc/src/backends/windows/test.rs
@@ -114,7 +114,7 @@ pub fn win_agent(
 
     let run_log = Report::parse(&clean_reports.join("\n"))?;
     debug!("reports: {}", reports);
-    debug!("stdout: {}", String::from_utf8(output.stdout)?);
-    debug!("stderr: {}", String::from_utf8(output.stderr)?);
+    debug!("stdout: {}", String::from_utf8_lossy(&output.stdout));
+    debug!("stderr: {}", String::from_utf8_lossy(&output.stderr));
     Ok(run_log)
 }
diff --git a/policies/rudderc/src/test.rs b/policies/rudderc/src/test.rs
@@ -57,8 +57,8 @@ impl Step {
             bail!(
                 "Test '{}' failed\nstdout: {}\nstderr: {}",
                 &self.command,
-                String::from_utf8(output.stdout)?,
-                String::from_utf8(output.stderr)?,
+                String::from_utf8_lossy(&output.stdout),
+                String::from_utf8_lossy(&output.stderr),
             )
         }
         Ok(())