summaryrefslogtreecommitdiff
path: root/tests/integration/serve_tests.rs
diff options
context:
space:
mode:
authorMarvin Hagemeister <marvin@deno.com>2024-09-14 23:30:06 +0200
committerGitHub <noreply@github.com>2024-09-14 23:30:06 +0200
commit597f2d8d4d9b91ee586b9787d6ba52d247e4ff87 (patch)
tree82bfa7272208b81b34e79572f3c9a5bcc6c4658f /tests/integration/serve_tests.rs
parentaf2d992ecd2b9320072164b6ee295c31a3194406 (diff)
feat: print `Listening on` messages on stderr instead of stdout (#25491)
Fixes https://github.com/denoland/deno/issues/25114 --------- Signed-off-by: Leo Kettmeir <crowlkats@toaxl.com> Co-authored-by: Bartek IwaƄczuk <biwanczuk@gmail.com> Co-authored-by: crowlkats <crowlkats@toaxl.com> Co-authored-by: Nathan Whitaker <17734409+nathanwhit@users.noreply.github.com>
Diffstat (limited to 'tests/integration/serve_tests.rs')
-rw-r--r--tests/integration/serve_tests.rs12
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/integration/serve_tests.rs b/tests/integration/serve_tests.rs
index c34b0e286..a1df7825d 100644
--- a/tests/integration/serve_tests.rs
+++ b/tests/integration/serve_tests.rs
@@ -61,11 +61,13 @@ impl ServeClientBuilder {
fn new() -> Self {
Self(
util::deno_cmd()
+ .env("NO_COLOR", "1")
.current_dir(util::testdata_path())
.arg("serve")
.arg("--port")
.arg("0")
- .stdout_piped(),
+ .stdout_piped()
+ .stderr_piped(),
None,
)
}
@@ -106,12 +108,12 @@ impl ServeClient {
fn output(self) -> String {
let mut child = self.child.borrow_mut();
child.kill().unwrap();
- let mut stdout = child.stdout.take().unwrap();
+ let mut stderr = child.stderr.take().unwrap();
child.wait().unwrap();
let mut output_buf = self.output_buf.borrow_mut();
- stdout.read_to_end(&mut output_buf).unwrap();
+ stderr.read_to_end(&mut output_buf).unwrap();
String::from_utf8(std::mem::take(&mut *output_buf)).unwrap()
}
@@ -128,7 +130,7 @@ impl ServeClient {
let mut buffer = self.output_buf.borrow_mut();
let mut temp_buf = [0u8; 64];
let mut child = self.child.borrow_mut();
- let stdout = child.stdout.as_mut().unwrap();
+ let stderr = child.stderr.as_mut().unwrap();
let port_regex = regex::bytes::Regex::new(r":(\d+)").unwrap();
let start = std::time::Instant::now();
@@ -141,7 +143,7 @@ impl ServeClient {
String::from_utf8_lossy(&buffer)
);
}
- let read = stdout.read(&mut temp_buf).unwrap();
+ let read = stderr.read(&mut temp_buf).unwrap();
buffer.extend_from_slice(&temp_buf[..read]);
if let Some(p) = port_regex
.captures(&buffer)