Skip to content
Merged
Changes from all commits
Commits
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
27 changes: 20 additions & 7 deletions crates/tiles/src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4244,21 +4244,33 @@ mod tests {
let _turn = crate::cache::turn();
let listener = std::net::TcpListener::bind("127.0.0.1:0").unwrap();
let addr = listener.local_addr().unwrap();
// Sent once the test has looked at the progress mid-download. The server holds the
// response open until then, so the progress is read while bytes are still to come, and
// then sends the rest at once: no sleeps for a busy runner to stretch (macOS CI). A
// failed assertion drops the sender, and the server closes the response at once rather
// than holding a download in flight for the tests after this one.
let (release, released) = std::sync::mpsc::channel::<()>();
std::thread::spawn(move || {
for stream in listener.incoming() {
let Ok(mut stream) = stream else { return };
let _ = stream.set_nodelay(true);
let path = read_request(&mut stream).split_whitespace().nth(1).unwrap_or("").to_string();
if path == "/a.shp" {
let _ = write!(stream, "HTTP/1.1 200 OK\r\nContent-Length: 10\r\nConnection: close\r\n\r\n0123456789");
continue;
}
// Chunked, so no length: a 1 kB chunk every 20 ms.
let _ = write!(stream, "HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n");
for _ in 0..200 {
if write!(stream, "3e8\r\n{}\r\n", "x".repeat(1000)).is_err() {
return;
}
std::thread::sleep(std::time::Duration::from_millis(20));
// Chunked, so no length: 10 kB, past the 5 kB the test waits for, then a pause
// until the test has looked.
let chunk = format!("3e8\r\n{}\r\n", "x".repeat(1000));
let head = format!("HTTP/1.1 200 OK\r\nTransfer-Encoding: chunked\r\nConnection: close\r\n\r\n{}", chunk.repeat(10));
if stream.write_all(head.as_bytes()).is_err() {
return;
}
if released.recv_timeout(std::time::Duration::from_secs(30)).is_err() {
return;
}
if stream.write_all(chunk.repeat(190).as_bytes()).is_err() {
return;
}
let _ = write!(stream, "0\r\n\r\n");
}
Expand All @@ -4280,6 +4292,7 @@ mod tests {
std::thread::sleep(std::time::Duration::from_millis(20));
}
assert_eq!(progress.fraction(), None, "{progress:?}");
let _ = release.send(());
assert!(rx.recv_timeout(std::time::Duration::from_secs(20)).unwrap().is_ok());
}

Expand Down
Loading