fix(test): capture inherited stdout and stderr for subprocesses in test output (#14395)

1 files changed, 6 insertions, 12 deletions

diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index aab062a6c..d7817eb1a 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -83,10 +83,8 @@ pub struct TestDescription {
 #[derive(Debug, Clone, PartialEq, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub enum TestOutput {
-  PrintStdout(String),
-  PrintStderr(String),
-  Stdout(Vec<u8>),
-  Stderr(Vec<u8>),
+  String(String),
+  Bytes(Vec<u8>),
 }
 
 #[derive(Debug, Clone, PartialEq, Deserialize)]
@@ -351,18 +349,14 @@ impl TestReporter for PrettyTestReporter {
       println!("{}", colors::gray("------- output -------"));
     }
     match output {
-      TestOutput::PrintStdout(line) => {
+      TestOutput::String(line) => {
+        // output everything to stdout in order to prevent
+        // stdout and stderr racing
         print!("{}", line)
       }
-      TestOutput::PrintStderr(line) => {
-        eprint!("{}", line)
-      }
-      TestOutput::Stdout(bytes) => {
+      TestOutput::Bytes(bytes) => {
         std::io::stdout().write_all(bytes).unwrap();
       }
-      TestOutput::Stderr(bytes) => {
-        std::io::stderr().write_all(bytes).unwrap();
-      }
     }
   }