diff --git a/tests/flow_control.rs b/tests/flow_control.rs index a554f15..bdeb7ec 100644 --- a/tests/flow_control.rs +++ b/tests/flow_control.rs @@ -57,84 +57,39 @@ fn release_capacity_sends_window_update() { let (io, srv) = mock::new(); - fn make_request() -> Request<()> { - Request::builder() - .method(Method::GET) - .uri("https://http2.akamai.com/") - .body(()).unwrap() - } - - - /* // End Goal: let mock = srv.assert_client_handshake().unwrap() - // .assert_settings ? - .and_then(|(_settings, srv)| { - srv.into_future().unwrap() - }) - .recv( + .recv_settings() + .recv_frame( frames::headers(1) - .request(head.method, head.uri) + .request("GET", "https://http2.akamai.com/") .eos() ) - .send(&[ + .send_frame( frames::headers(1) - .response(200), - frames::data(1, &payload[0..16_384]), - frames::data(1, &payload[0..16_384]), - frames::data(1, &payload[0..16_384]), - ]) - .recv( + .response(200) + ) + .send_frame(frames::data(1, &payload[0..16_384])) + .send_frame(frames::data(1, &payload[16_384..16_384 * 2])) + .send_frame(frames::data(1, &payload[16_384 * 2..16_384 * 3])) + .recv_frame( frames::window_update(0, 32_768) ) - .recv( + .recv_frame( frames::window_update(1, 32_768) ) - */ - - let mock = srv.assert_client_handshake().unwrap() - .and_then(|(_settings, srv)| { - srv.into_future().unwrap() - }) - .and_then(|(frame, mut srv)| { - let head = make_request().into_parts().0; - let expected = frames::headers(1) - .request(head.method, head.uri) - .fields(head.headers) + .send_frame( + frames::data(1, &payload[16_384 * 3..]) .eos() - .into(); - assert_eq!(frame.unwrap(), expected); - - let res = frames::headers(1) - .response(200) - .into(); - srv.send(res).unwrap(); - let data = frames::data(1, &payload[0..16_384]); - srv.send(data.into()).unwrap(); - let data = frames::data(1, &payload[16_384..16_384 * 2]); - srv.send(data.into()).unwrap(); - let data = frames::data(1, &payload[16_384 * 2..16_384 * 3]); - srv.send(data.into()).unwrap(); - srv.into_future().unwrap() - }) - .and_then(|(frame, srv)| { - let expected = frames::window_update(0, 32_768); - assert_eq!(frame.unwrap(), expected.into()); - srv.into_future().unwrap() - }) - .and_then(|(frame, mut srv)| { - let expected = frames::window_update(1, 32_768); - assert_eq!(frame.unwrap(), expected.into()); - - let data = frames::data(1, &payload[16_384 * 3..]) - .eos(); - srv.send(data.into()).unwrap(); - Ok(()) - }); + ) + // gotta end the connection + .map(drop); let h2 = Client::handshake(io).unwrap() .and_then(|mut h2| { - eprintln!("h2.request"); - let request = make_request(); + let request = Request::builder() + .method(Method::GET) + .uri("https://http2.akamai.com/") + .body(()).unwrap(); let req = h2.request(request, true).unwrap() .unwrap() @@ -175,63 +130,52 @@ fn release_capacity_of_small_amount_does_not_send_window_update() { let payload = [0; 16]; - let mock = mock_io::Builder::new() - .handshake() - .write(&[ - // GET / - 0, 0, 16, 1, 5, 0, 0, 0, 1, 130, 135, 65, 139, 157, 41, - 172, 75, 143, 168, 233, 25, 151, 33, 233, 132, - ]) - .write(frames::SETTINGS_ACK) - // Read response - .read(&[0, 0, 1, 1, 4, 0, 0, 0, 1, 0x88]) - .read(&[ - // DATA - 0, 0, 16, 0, 1, 0, 0, 0, 1, - ]) - .read(&payload[..]) - // write() or WINDOW_UPDATE purposefully excluded + let (io, srv) = mock::new(); - // we send a 2nd stream in order to test the window update is - // is actually written to the socket - .write(&[ - // GET / - 0, 0, 4, 1, 5, 0, 0, 0, 3, 130, 135, 190, 132, - ]) - .read(&[0, 0, 1, 1, 5, 0, 0, 0, 3, 0x88]) - .build(); + let mock = srv.assert_client_handshake().unwrap() + .recv_settings() + .recv_frame( + frames::headers(1) + .request("GET", "https://http2.akamai.com/") + .eos() + ) + .send_frame( + frames::headers(1) + .response(200) + ) + .send_frame(frames::data(1, &payload[..]).eos()) + // gotta end the connection + .map(drop); - let mut h2 = Client::handshake(mock) - .wait().unwrap(); + let h2 = Client::handshake(io).unwrap() + .and_then(|mut h2| { + let request = Request::builder() + .method(Method::GET) + .uri("https://http2.akamai.com/") + .body(()).unwrap(); - let request = Request::builder() - .method(Method::GET) - .uri("https://http2.akamai.com/") - .body(()).unwrap(); - - let mut stream = h2.request(request, true).unwrap(); - - // Get the response - let resp = h2.run(poll_fn(|| stream.poll_response())).unwrap(); - assert_eq!(resp.status(), StatusCode::OK); - - let mut body = resp.into_parts().1; - let buf = h2.run(poll_fn(|| body.poll())).unwrap().unwrap(); - - // release some capacity to send a window_update - body.release_capacity(buf.len()).unwrap(); - - // send a 2nd stream to force flushing of window updates - let request = Request::builder() - .method(Method::GET) - .uri("https://http2.akamai.com/") - .body(()).unwrap(); - let mut stream = h2.request(request, true).unwrap(); - let resp = h2.run(poll_fn(|| stream.poll_response())).unwrap(); - assert_eq!(resp.status(), StatusCode::OK); - - - h2.wait().unwrap(); + let req = h2.request(request, true).unwrap() + .unwrap() + // Get the response + .and_then(|resp| { + assert_eq!(resp.status(), StatusCode::OK); + let body = resp.into_parts().1; + body.into_future().unwrap() + }) + // read the small body and then release it + .and_then(|(buf, mut body)| { + let buf = buf.unwrap(); + assert_eq!(buf.len(), 16); + body.release_capacity(buf.len()).unwrap(); + body.into_future().unwrap() + }) + .and_then(|(buf, _)| { + assert!(buf.is_none()); + Ok(()) + }); + h2.unwrap().join(req) + }); + h2.join(mock).wait().unwrap(); } #[test]