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

6 files changed, 61 insertions, 29 deletions

diff --git a/cli/lsp/testing/execution.rs b/cli/lsp/testing/execution.rs
index 93f3d9ba3..6f90e60a3 100644
--- a/cli/lsp/testing/execution.rs
+++ b/cli/lsp/testing/execution.rs
@@ -760,9 +760,8 @@ impl test::TestReporter for LspTestReporter {
         .and_then(|v| v.last().map(|td| td.into()))
     });
     let value = match output {
-      test::TestOutput::PrintStdout(value)
-      | test::TestOutput::PrintStderr(value) => value.replace('\n', "\r\n"),
-      test::TestOutput::Stdout(bytes) | test::TestOutput::Stderr(bytes) => {
+      test::TestOutput::String(value) => value.replace('\n', "\r\n"),
+      test::TestOutput::Bytes(bytes) => {
         String::from_utf8_lossy(bytes).replace('\n', "\r\n")
       }
     };
diff --git a/cli/ops/testing.rs b/cli/ops/testing.rs
index 3a57d307b..008e4d113 100644
--- a/cli/ops/testing.rs
+++ b/cli/ops/testing.rs
@@ -79,12 +79,8 @@ pub fn create_stdout_stderr_pipes(
   let (stdout_reader, stdout_writer) = os_pipe::pipe().unwrap();
   let (stderr_reader, stderr_writer) = os_pipe::pipe().unwrap();
 
-  start_output_redirect_thread(stdout_reader, sender.clone(), |bytes| {
-    TestOutput::Stdout(bytes)
-  });
-  start_output_redirect_thread(stderr_reader, sender, |bytes| {
-    TestOutput::Stderr(bytes)
-  });
+  start_output_redirect_thread(stdout_reader, sender.clone());
+  start_output_redirect_thread(stderr_reader, sender);
 
   (stdout_writer, stderr_writer)
 }
@@ -92,7 +88,6 @@ pub fn create_stdout_stderr_pipes(
 fn start_output_redirect_thread(
   mut pipe_reader: os_pipe::PipeReader,
   sender: UnboundedSender<TestEvent>,
-  map_test_output: impl Fn(Vec<u8>) -> TestOutput + Send + 'static,
 ) {
   tokio::task::spawn_blocking(move || loop {
     let mut buffer = [0; 512];
@@ -101,7 +96,9 @@ fn start_output_redirect_thread(
       Ok(size) => size,
     };
     if sender
-      .send(TestEvent::Output(map_test_output(buffer[0..size].to_vec())))
+      .send(TestEvent::Output(TestOutput::Bytes(
+        buffer[0..size].to_vec(),
+      )))
       .is_err()
     {
       break;
@@ -170,14 +167,10 @@ fn op_dispatch_test_event(
 pub fn op_print(
   state: &mut OpState,
   msg: String,
-  is_err: bool,
+  _is_err: bool,
 ) -> Result<(), AnyError> {
   let sender = state.borrow::<UnboundedSender<TestEvent>>().clone();
-  let msg = if is_err {
-    TestOutput::PrintStderr(msg)
-  } else {
-    TestOutput::PrintStdout(msg)
-  };
+  let msg = TestOutput::String(msg);
   sender.send(TestEvent::Output(msg)).ok();
   Ok(())
 }
diff --git a/cli/tests/integration/test_tests.rs b/cli/tests/integration/test_tests.rs
index 0b811349a..1e8db52fd 100644
--- a/cli/tests/integration/test_tests.rs
+++ b/cli/tests/integration/test_tests.rs
@@ -302,6 +302,12 @@ itest!(no_prompt_with_denied_perms {
   output: "test/no_prompt_with_denied_perms.out",
 });
 
+itest!(captured_subprocess_output {
+  args: "test --allow-run --allow-read --unstable test/captured_subprocess_output.ts",
+  exit_code: 0,
+  output: "test/captured_subprocess_output.out",
+});
+
 #[test]
 fn recursive_permissions_pledge() {
   let output = util::deno_cmd()
diff --git a/cli/tests/testdata/test/captured_subprocess_output.out b/cli/tests/testdata/test/captured_subprocess_output.out
new file mode 100644
index 000000000..2a40170af
--- /dev/null
+++ b/cli/tests/testdata/test/captured_subprocess_output.out
@@ -0,0 +1,17 @@
+[WILDCARD]
+running 1 test from [WILDCARD]/captured_subprocess_output.ts
+output ...
+------- output -------
+1
+2
+3
+4
+5
+6
+7
+8
+----- output end -----
+ok ([WILDCARD]s)
+
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out ([WILDCARD]s)
+[WILDCARD]
diff --git a/cli/tests/testdata/test/captured_subprocess_output.ts b/cli/tests/testdata/test/captured_subprocess_output.ts
new file mode 100644
index 000000000..277ac340e
--- /dev/null
+++ b/cli/tests/testdata/test/captured_subprocess_output.ts
@@ -0,0 +1,23 @@
+Deno.test("output", async () => {
+  const p = Deno.run({
+    cmd: [Deno.execPath(), "eval", "console.log(1); console.error(2);"],
+  });
+  await p.status();
+  await p.close();
+  Deno.spawnSync(Deno.execPath(), {
+    args: ["eval", "console.log(3); console.error(4);"],
+    stdout: "inherit",
+    stderr: "inherit",
+  });
+  await Deno.spawn(Deno.execPath(), {
+    args: ["eval", "console.log(5); console.error(6);"],
+    stdout: "inherit",
+    stderr: "inherit",
+  });
+  const c = await Deno.spawnChild(Deno.execPath(), {
+    args: ["eval", "console.log(7); console.error(8);"],
+    stdout: "inherit",
+    stderr: "inherit",
+  });
+  await c.status;
+});
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();
-      }
     }
   }