forked/h2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disallow nightly failures (#115)

Browse Source 
Always install rustfmt since nightly may change underneath it, causing
linking to break.

Apply rustfmt
This commit is contained in:
Oliver Gould
2017-09-24 19:25:50 -07:00
committed by Sean McArthur
parent a72a6bc8f0
commit dad113e17b
10 changed files with 34 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tests/client_request.rs
View File

@@ -75,9 +75,7 @@ fn request_stream_id_overflows() {
.unwrap();
// first request is allowed
let req = h2.send_request(request, true)
.unwrap()
.unwrap();
let req = h2.send_request(request, true).unwrap().unwrap();
let request = Request::builder()
.method(Method::GET)
@@ -117,17 +115,12 @@ fn request_over_max_concurrent_streams_errors() {
let (io, srv) = mock::new();
let srv = srv.assert_client_handshake_with_settings(
frames::settings()
let srv = srv.assert_client_handshake_with_settings(frames::settings()
// super tiny server
.max_concurrent_streams(1)
)
.max_concurrent_streams(1))
.unwrap()
.recv_settings()
.recv_frame(
frames::headers(1)
.request("POST", "https://example.com/")
)
.recv_frame(frames::headers(1).request("POST", "https://example.com/"))
.send_frame(frames::headers(1).response(200))
.close();
@@ -141,15 +134,12 @@ fn request_over_max_concurrent_streams_errors() {
.unwrap();
// first request is allowed
let req = h2.send_request(request, false)
.unwrap()
.unwrap();
let req = h2.send_request(request, false).unwrap().unwrap();
// drive the connection some so we can receive the server settings
h2.drive(req)
})
.and_then(|(mut h2, _)| {
let request = Request::builder()
.method(Method::GET)
.uri("https://example.com/")

27
tests/flow_control.rs
View File

@@ -380,17 +380,12 @@ fn stream_close_by_data_frame_releases_capacity() {
h2.unwrap()
});
let srv = srv.assert_client_handshake().unwrap()
let srv = srv.assert_client_handshake()
.unwrap()
.recv_settings()
.recv_frame(
frames::headers(1)
.request("POST", "https://http2.akamai.com/")
)
.recv_frame(frames::headers(1).request("POST", "https://http2.akamai.com/"))
.send_frame(frames::headers(1).response(200))
.recv_frame(
frames::headers(3)
.request("POST", "https://http2.akamai.com/")
)
.recv_frame(frames::headers(3).request("POST", "https://http2.akamai.com/"))
.send_frame(frames::headers(3).response(200))
.recv_frame(frames::data(1, &b""[..]).eos())
.recv_frame(frames::data(3, &b"hello"[..]).eos())
@@ -536,9 +531,7 @@ fn recv_window_update_on_stream_closed_by_data_frame() {
let srv = srv.assert_client_handshake()
.unwrap()
.recv_settings()
.recv_frame(
frames::headers(1).request("POST", "https://http2.akamai.com/"),
)
.recv_frame(frames::headers(1).request("POST", "https://http2.akamai.com/"))
.send_frame(frames::headers(1).response(200))
.recv_frame(frames::data(1, "hello").eos())
.send_frame(frames::window_update(1, 5))
@@ -631,8 +624,8 @@ fn reserved_capacity_assigned_in_multi_window_updates() {
#[test]
fn connection_notified_on_released_capacity() {
use futures::sync::oneshot;
use std::thread;
use std::sync::mpsc;
use std::thread;
let _ = ::env_logger::init();
let (io, srv) = mock::new();
@@ -685,15 +678,11 @@ fn connection_notified_on_released_capacity() {
let (mut h2, _) = h2.drive(settings_rx).wait().unwrap();
let request = Request::get("https://example.com/a")
.body(())
.unwrap();
let request = Request::get("https://example.com/a").body(()).unwrap();
tx.send(h2.send_request(request, true).unwrap()).unwrap();
let request = Request::get("https://example.com/b")
.body(())
.unwrap();
let request = Request::get("https://example.com/b").body(()).unwrap();
tx.send(h2.send_request(request, true).unwrap()).unwrap();

8
tests/push_promise.rs
View File

@@ -16,9 +16,7 @@ fn recv_push_works() {
.request("GET", "https://http2.akamai.com/")
.eos(),
)
.send_frame(
frames::push_promise(1, 2).request("GET", "https://http2.akamai.com/style.css"),
)
.send_frame(frames::push_promise(1, 2).request("GET", "https://http2.akamai.com/style.css"))
.send_frame(frames::headers(1).response(200).eos())
.send_frame(frames::headers(2).response(200).eos());
@@ -55,9 +53,7 @@ fn recv_push_when_push_disabled_is_conn_error() {
.request("GET", "https://http2.akamai.com/")
.eos(),
)
.send_frame(
frames::push_promise(1, 3).request("GET", "https://http2.akamai.com/style.css"),
)
.send_frame(frames::push_promise(1, 3).request("GET", "https://http2.akamai.com/style.css"))
.send_frame(frames::headers(1).response(200).eos())
.recv_frame(frames::go_away(0).protocol_error());