Skip to content

ci: speed up Windows integration tests #979

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 3 commits into from
Aug 10, 2026
Merged

ci: speed up Windows integration tests #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5da52c4
ci: run integration tests in release mode
ryanfowler Aug 10, 2026
b7fce7f
ci: limit release integration tests to Windows
ryanfowler Aug 10, 2026
609b910
test: remove local server polling delays
ryanfowler Aug 10, 2026
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
57 changes: 26 additions & 31 deletions tests/support/http.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::collections::HashMap;
use std::io::{BufRead, BufReader, Read, Write};
use std::net::{Shutdown, TcpListener};
use std::net::{Shutdown, TcpListener, TcpStream};
use std::sync::{Arc, Mutex, mpsc};
use std::thread;
use std::time::{Duration, Instant};
Expand Down Expand Up @@ -87,6 +87,7 @@ pub(crate) struct TestServer {
pub(crate) requests: Arc<Mutex<Vec<TestRequest>>>,
request_notify: mpsc::Receiver<()>,
shutdown: Option<mpsc::Sender<()>>,
shutdown_addr: String,
join: Option<thread::JoinHandle<()>>,
}

Expand All @@ -101,53 +102,46 @@ impl TestServer {
handler: impl Fn(TestRequest) -> TestResponse + Send + Sync + 'static,
) -> Self {
let listener = TcpListener::bind("127.0.0.1:0").expect("bind test server");
listener
.set_nonblocking(true)
.expect("set test listener nonblocking");
let url = format!("http://{}", listener.local_addr().expect("local addr"));
let addr = listener.local_addr().expect("local addr");
let url = format!("http://{addr}");
let requests = Arc::new(Mutex::new(Vec::new()));
let handler = Arc::new(handler);
let (shutdown_tx, shutdown_rx) = mpsc::channel();
let (notify_tx, notify_rx) = mpsc::channel();
let request_log = Arc::clone(&requests);
let join = thread::spawn(move || {
loop {
for stream in listener.incoming() {
if shutdown_rx.try_recv().is_ok() {
break;
}
match listener.accept() {
Ok((stream, _)) => {
let _ = stream.set_nonblocking(false);
let handler = Arc::clone(&handler);
let request_log = Arc::clone(&request_log);
let notify = notify_tx.clone();
thread::spawn(move || {
let mut writer = stream.try_clone().expect("clone response stream");
let mut reader = BufReader::new(stream);
while let Some(req) = read_request(&mut reader) {
let close = req.header("connection").eq_ignore_ascii_case("close");
request_log.lock().unwrap().push(req.clone());
let _ = notify.send(());
let resp = handler(req);
write_response(&mut writer, resp);
if close {
break;
}
}
});
}
Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
thread::sleep(Duration::from_millis(5));
let Ok(stream) = stream else {
break;
};
let handler = Arc::clone(&handler);
let request_log = Arc::clone(&request_log);
let notify = notify_tx.clone();
thread::spawn(move || {
let mut writer = stream.try_clone().expect("clone response stream");
let mut reader = BufReader::new(stream);
while let Some(req) = read_request(&mut reader) {
let close = req.header("connection").eq_ignore_ascii_case("close");
request_log.lock().unwrap().push(req.clone());
let _ = notify.send(());
let resp = handler(req);
write_response(&mut writer, resp);
if close {
break;
}
}
Err(_) => break,
}
});
}
});
Self {
url,
requests,
request_notify: notify_rx,
shutdown: Some(shutdown_tx),
shutdown_addr: addr.to_string(),
join: Some(join),
}
}
Expand All @@ -161,6 +155,7 @@ impl Drop for TestServer {
fn drop(&mut self) {
if let Some(tx) = self.shutdown.take() {
let _ = tx.send(());
let _ = TcpStream::connect(&self.shutdown_addr);
}
if let Some(join) = self.join.take() {
let _ = join.join();
Expand Down
49 changes: 23 additions & 26 deletions tests/support/proxy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ pub(crate) struct HttpsProxyTestServer {
pub(crate) client_key_path: PathBuf,
pub(crate) requests: Arc<Mutex<Vec<TestRequest>>>,
pub(crate) shutdown: Option<mpsc::Sender<()>>,
shutdown_addr: String,
pub(crate) join: Option<thread::JoinHandle<()>>,
}

Expand All @@ -30,6 +31,7 @@ impl Drop for HttpsProxyTestServer {
fn drop(&mut self) {
if let Some(tx) = self.shutdown.take() {
let _ = tx.send(());
let _ = TcpStream::connect(&self.shutdown_addr);
}
if let Some(join) = self.join.take() {
let _ = join.join();
Expand Down Expand Up @@ -232,41 +234,35 @@ pub(crate) fn start_https_proxy(require_client_auth: bool) -> HttpsProxyTestServ
let config = Arc::new(config);

let listener = TcpListener::bind("127.0.0.1:0").expect("bind HTTPS proxy");
listener.set_nonblocking(true).unwrap();
let port = listener.local_addr().unwrap().port();
let shutdown_addr = format!("127.0.0.1:{port}");
let url = format!("https://localhost:{port}");
let requests = Arc::new(Mutex::new(Vec::new()));
let requests_for_thread = Arc::clone(&requests);
let (tx, rx) = mpsc::channel();
let join = thread::spawn(move || {
loop {
for stream in listener.incoming() {
if rx.try_recv().is_ok() {
break;
}
match listener.accept() {
Ok((stream, _)) => {
let _ = stream.set_nonblocking(false);
let config = Arc::clone(&config);
let requests = Arc::clone(&requests_for_thread);
thread::spawn(move || {
let Ok(conn) = rustls::ServerConnection::new(config) else {
return;
};
let mut tls = rustls::StreamOwned::new(conn, stream);
let mut reader = BufReader::new(&mut tls);
let Some(req) = read_request(&mut reader) else {
return;
};
requests.lock().unwrap().push(req);
let tls = reader.into_inner();
write_response(tls, TestResponse::ok("proxied"));
});
}
Err(err) if err.kind() == std::io::ErrorKind::WouldBlock => {
thread::sleep(Duration::from_millis(5));
}
Err(_) => break,
}
let Ok(stream) = stream else {
break;
};
let config = Arc::clone(&config);
let requests = Arc::clone(&requests_for_thread);
thread::spawn(move || {
let Ok(conn) = rustls::ServerConnection::new(config) else {
return;
};
let mut tls = rustls::StreamOwned::new(conn, stream);
let mut reader = BufReader::new(&mut tls);
let Some(req) = read_request(&mut reader) else {
return;
};
requests.lock().unwrap().push(req);
let tls = reader.into_inner();
write_response(tls, TestResponse::ok("proxied"));
});
}
});

Expand All @@ -277,6 +273,7 @@ pub(crate) fn start_https_proxy(require_client_auth: bool) -> HttpsProxyTestServ
client_key_path,
requests,
shutdown: Some(tx),
shutdown_addr,
join: Some(join),
}
}
Expand Down
Loading
Loading