foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-21 15:04:11 -05:00
Code Issues Packages 1 Wiki Activity

chore: maybe fix flaky serve_parallel test (#25668)

Browse source
This commit is contained in:
David Sherret 2024-09-16 19:55:49 +01:00 committed by GitHub
parent 36a1a79f17
commit 6ce16145dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tests/integration/serve_tests.rs
View file

@ -39,15 +39,18 @@ impl ServeClientBuilder {
ServeClient::with_child(child) ServeClient::with_child(child)
} }
fn map( fn map(
self, self,
f: impl FnOnce(util::TestCommandBuilder) -> util::TestCommandBuilder, f: impl FnOnce(util::TestCommandBuilder) -> util::TestCommandBuilder,
) -> Self { ) -> Self {
Self(f(self.0), self.1) Self(f(self.0), self.1)
} }
fn entry_point(self, file: impl AsRef<str>) -> Self { fn entry_point(self, file: impl AsRef<str>) -> Self {
Self(self.0, Some(file.as_ref().into())) Self(self.0, Some(file.as_ref().into()))
} }
fn worker_count(self, n: Option<u64>) -> Self { fn worker_count(self, n: Option<u64>) -> Self {
self.map(|t| { self.map(|t| {
let t = t.arg("--parallel"); let t = t.arg("--parallel");
@ -58,6 +61,7 @@ impl ServeClientBuilder {
} }
}) })
} }
fn new() -> Self { fn new() -> Self {
Self( Self(
util::deno_cmd() util::deno_cmd()
@ -77,6 +81,7 @@ impl ServeClient {
fn builder() -> ServeClientBuilder { fn builder() -> ServeClientBuilder {
ServeClientBuilder::new() ServeClientBuilder::new()
} }
fn with_child(child: DenoChild) -> Self { fn with_child(child: DenoChild) -> Self {
Self { Self {
child: RefCell::new(child), child: RefCell::new(child),
@ -131,7 +136,8 @@ impl ServeClient {
let mut temp_buf = [0u8; 64]; let mut temp_buf = [0u8; 64];
let mut child = self.child.borrow_mut(); let mut child = self.child.borrow_mut();
let stderr = child.stderr.as_mut().unwrap(); let stderr = child.stderr.as_mut().unwrap();
let port_regex = regex::bytes::Regex::new(r":(\d+)").unwrap(); let port_regex =
regex::bytes::Regex::new(r"Listening on https?:[^:]+:(\d+)/").unwrap();
let start = std::time::Instant::now(); let start = std::time::Instant::now();
// try to find the port number in the output // try to find the port number in the output
@ -156,6 +162,9 @@ impl ServeClient {
// I don't want to switch RefCell to Mutex just for this // I don't want to switch RefCell to Mutex just for this
std::thread::sleep(Duration::from_millis(10)); std::thread::sleep(Duration::from_millis(10));
}; };
eprintln!("stderr: {}", String::from_utf8_lossy(&temp_buf));
self self
.endpoint .endpoint
.replace(Some(format!("http://127.0.0.1:{port}"))); .replace(Some(format!("http://127.0.0.1:{port}")));