Skip to content

fix: harden integration tests against macOS port reuse races #840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ryanfowler merged 1 commit into from
Jul 6, 2026
Merged

fix: harden integration tests against macOS port reuse races #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions tests/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ fn schemeless_https_connect_error_suggests_plaintext_url() {
.set_nonblocking(true)
.expect("set plaintext listener nonblocking");
let port = listener.local_addr().expect("local addr").port();
let (ready_tx, ready_rx) = mpsc::channel();
let join = thread::spawn(move || {
let _ = ready_tx.send(());
for _ in 0..2 {
let Ok(mut stream) =
accept_tcp_connection(&listener, Duration::from_secs(3), "plaintext TLS hint")
Expand All @@ -111,6 +113,9 @@ fn schemeless_https_connect_error_suggests_plaintext_url() {
}
});

ready_rx
.recv_timeout(Duration::from_secs(1))
.expect("plaintext listener thread ready");
let dns_addr = start_udp_dns_server("fetch-plaintext-hint.test.", Ipv4Addr::new(127, 0, 0, 1));
let raw_url = format!("fetch-plaintext-hint.test:{port}/status");
let res = run_fetch_once(FetchOpts::default(), &["--dns-server", &dns_addr, &raw_url]);
Expand Down Expand Up @@ -995,7 +1000,10 @@ fn compressed_sse_retry_drains_first_response_before_replay() {
.expect("set compressed sse retry listener nonblocking");
let url = format!("http://{}", listener.local_addr().expect("local addr"));
let (outcome_tx, outcome_rx) = mpsc::channel();
let (ready_tx, ready_rx) = mpsc::channel();
let join = thread::spawn(move || {
// Signal that the server thread has started and the listener is ready.
let _ = ready_tx.send(());
let result = (|| -> Result<Duration, String> {
let mut first_stream = accept_tcp_connection(
&listener,
Expand Down Expand Up @@ -1071,6 +1079,10 @@ fn compressed_sse_retry_drains_first_response_before_replay() {
let _ = outcome_tx.send(result);
});

// Wait for the server thread to enter its accept loop before connecting.
ready_rx
.recv_timeout(Duration::from_secs(1))
.expect("compressed SSE retry server ready");
let res = run_fetch(&[&url, "--format", "on"]);
assert_exit(&res, 0);
assert_eq!(res.stdout, "event: message\ndata: uncompressed\n\n");
Expand Down
6 changes: 4 additions & 2 deletions tests/support/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,13 @@ pub(crate) fn run_fetch_opts(opts: FetchOpts, args: &[&str]) -> FetchOutput {
let env = opts.env.clone();
let bin = opts.bin.clone();
let mut result = run_fetch_once(opts, args);
for _ in 0..4 {
let mut delay_ms: u64 = 25;
for _ in 0..9 {
if !can_retry || !is_transient_local_server_error(&result) {
return result;
}
thread::sleep(Duration::from_millis(25));
thread::sleep(Duration::from_millis(delay_ms));
delay_ms = (delay_ms * 2).min(1000);
result = run_fetch_once(
FetchOpts {
stdin: None,
Expand Down
Loading