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

start adding tracing spans to internals (#478)

Browse Source 
We've adopted `tracing` for diagnostics, but currently, it is just being
used as a drop-in replacement for the `log` crate. Ideally, we would
want to start emitting more structured diagnostics, using `tracing`'s
`Span`s and structured key-value fields.

A lot of the logging in `h2` is already written in a style that imitates
the formatting of structured key-value logs, but as textual log
messages. Migrating the logs to structured `tracing` events therefore is
pretty easy to do. I've also started adding spans, mostly in the read
path.

Finally, I've updated the tests to use `tracing` rather than
`env_logger`. The tracing setup happens in a macro, so that a span for
each test with the test's name can be generated and entered. This will
make the test output easier to read if multiple tests are run
concurrently with `--nocapture`.

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
This commit is contained in:
Eliza Weisman
2020-08-17 17:29:22 -07:00
committed by GitHub
parent d3c2bba18b
commit fc7f63f641
25 changed files with 363 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/h2-support/Cargo.toml
View File

@@ -8,7 +8,8 @@ edition = "2018"
h2 = { path = "../..", features = ["stream", "unstable"] }
bytes = "0.5"
env_logger = "0.5.9"
tracing = "0.1"
tracing-subscriber = { version = "0.2", default-features = false, features = ["fmt", "chrono", "ansi"] }
futures = { version = "0.3", default-features = false }
http = "0.2"
tokio = { version = "0.2", features = ["time"] }

17
tests/h2-support/src/lib.rs
View File

@@ -8,6 +8,7 @@ pub mod raw;
pub mod frames;
pub mod mock;
pub mod prelude;
pub mod trace;
pub mod util;
mod client_ext;
@@ -24,3 +25,19 @@ pub type Codec<T> = h2::Codec<T, bytes::Bytes>;
// This is the frame type that is sent
pub type SendFrame = h2::frame::Frame<bytes::Bytes>;
#[macro_export]
macro_rules! trace_init {
() => {
let _guard = $crate::trace::init();
let span = $crate::prelude::tracing::info_span!(
"test",
"{}",
// get the name of the test thread to generate a unique span for the test
std::thread::current()
.name()
.expect("test threads must be named")
);
let _e = span.enter();
};
}

2
tests/h2-support/src/prelude.rs
View File

@@ -28,7 +28,7 @@ pub use super::assert::assert_frame_eq;
// Re-export useful crates
pub use tokio_test::io as mock_io;
pub use {bytes, env_logger, futures, http, tokio::io as tokio_io};
pub use {bytes, futures, http, tokio::io as tokio_io, tracing, tracing_subscriber};
// Re-export primary future types
pub use futures::{Future, Sink, Stream};

41
tests/h2-support/src/trace.rs Normal file
View File

@@ -0,0 +1,41 @@
use std::{io, str};
pub use tracing;
pub use tracing_subscriber;
pub fn init() -> tracing::dispatcher::DefaultGuard {
tracing::subscriber::set_default(
tracing_subscriber::fmt()
.with_max_level(tracing::Level::TRACE)
.with_span_events(tracing_subscriber::fmt::format::FmtSpan::CLOSE)
.with_writer(PrintlnWriter { _p: () })
.finish(),
)
}
struct PrintlnWriter {
_p: (),
}
impl tracing_subscriber::fmt::MakeWriter for PrintlnWriter {
type Writer = PrintlnWriter;
fn make_writer(&self) -> Self::Writer {
PrintlnWriter { _p: () }
}
}
impl io::Write for PrintlnWriter {
fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
let s = str::from_utf8(buf).map_err(|e| io::Error::new(io::ErrorKind::InvalidInput, e))?;
println!("{}", s);
Ok(s.len())
}
fn write_fmt(&mut self, fmt: std::fmt::Arguments<'_>) -> io::Result<()> {
println!("{}", fmt);
Ok(())
}
fn flush(&mut self) -> io::Result<()> {
Ok(())
}
}

44
tests/h2-tests/tests/client_request.rs
View File

@@ -7,7 +7,7 @@ use std::task::Context;
#[tokio::test]
async fn handshake() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -24,7 +24,7 @@ async fn handshake() {
#[tokio::test]
async fn client_other_thread() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -60,7 +60,7 @@ async fn client_other_thread() {
#[tokio::test]
async fn recv_invalid_server_stream_id() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -96,7 +96,7 @@ async fn recv_invalid_server_stream_id() {
#[tokio::test]
async fn request_stream_id_overflows() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -149,7 +149,7 @@ async fn request_stream_id_overflows() {
#[tokio::test]
async fn client_builder_max_concurrent_streams() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mut settings = frame::Settings::default();
@@ -187,7 +187,7 @@ async fn client_builder_max_concurrent_streams() {
#[tokio::test]
async fn request_over_max_concurrent_streams_errors() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -286,7 +286,7 @@ async fn request_over_max_concurrent_streams_errors() {
#[tokio::test]
async fn send_request_poll_ready_when_connection_error() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -379,7 +379,7 @@ async fn send_request_poll_ready_when_connection_error() {
#[tokio::test]
async fn send_reset_notifies_recv_stream() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -432,7 +432,7 @@ async fn send_reset_notifies_recv_stream() {
#[tokio::test]
async fn http_11_request_without_scheme_or_authority() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -462,7 +462,7 @@ async fn http_11_request_without_scheme_or_authority() {
#[tokio::test]
async fn http_2_request_without_scheme_or_authority() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -499,7 +499,7 @@ fn request_with_h1_version() {}
#[tokio::test]
async fn request_with_connection_headers() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
// can't assert full handshake, since client never sends a request, and
@@ -542,7 +542,7 @@ async fn request_with_connection_headers() {
#[tokio::test]
async fn connection_close_notifies_response_future() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
let settings = srv.assert_client_handshake().await;
@@ -581,7 +581,7 @@ async fn connection_close_notifies_response_future() {
#[tokio::test]
async fn connection_close_notifies_client_poll_ready() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -626,7 +626,7 @@ async fn connection_close_notifies_client_poll_ready() {
#[tokio::test]
async fn sending_request_on_closed_connection() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -688,7 +688,7 @@ async fn sending_request_on_closed_connection() {
#[tokio::test]
async fn recv_too_big_headers() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -751,7 +751,7 @@ async fn recv_too_big_headers() {
#[tokio::test]
async fn pending_send_request_gets_reset_by_peer_properly() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let payload = Bytes::from(vec![0; (frame::DEFAULT_INITIAL_WINDOW_SIZE * 2) as usize]);
@@ -823,7 +823,7 @@ async fn pending_send_request_gets_reset_by_peer_properly() {
#[tokio::test]
async fn request_without_path() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -854,7 +854,7 @@ async fn request_without_path() {
#[tokio::test]
async fn request_options_with_star() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
// Note the lack of trailing slash.
@@ -899,7 +899,7 @@ async fn notify_on_send_capacity() {
// stream, the client is notified.
use tokio::sync::oneshot;
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let (done_tx, done_rx) = oneshot::channel();
@@ -979,7 +979,7 @@ async fn notify_on_send_capacity() {
#[tokio::test]
async fn send_stream_poll_reset() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1017,7 +1017,7 @@ async fn drop_pending_open() {
// This test checks that a stream queued for pending open behaves correctly when its
// client drops.
use tokio::sync::oneshot;
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let (init_tx, init_rx) = oneshot::channel();
@@ -1105,7 +1105,7 @@ async fn malformed_response_headers_dont_unlink_stream() {
// no remaining references correctly resets the stream, without prematurely
// unlinking it.
use tokio::sync::oneshot;
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let (drop_tx, drop_rx) = oneshot::channel();

4
tests/h2-tests/tests/codec_read.rs
View File

@@ -130,7 +130,7 @@ fn read_headers_empty_payload() {}
#[tokio::test]
async fn read_continuation_frames() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let large = build_large_headers();
@@ -191,7 +191,7 @@ async fn read_continuation_frames() {
async fn update_max_frame_len_at_rest() {
use futures::StreamExt;
let _ = env_logger::try_init();
h2_support::trace_init!();
// TODO: add test for updating max frame length in flight as well?
let mut codec = raw_codec! {
read => [

6
tests/h2-tests/tests/codec_write.rs
View File

@@ -5,7 +5,7 @@ use h2_support::prelude::*;
async fn write_continuation_frames() {
// An invalid dependency ID results in a stream level error. The hpack
// payload should still be decoded.
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let large = build_large_headers();
@@ -56,7 +56,7 @@ async fn write_continuation_frames() {
async fn client_settings_header_table_size() {
// A server sets the SETTINGS_HEADER_TABLE_SIZE to 0, test that the
// client doesn't send indexed headers.
let _ = env_logger::try_init();
h2_support::trace_init!();
let io = mock_io::Builder::new()
// Read SETTINGS_HEADER_TABLE_SIZE = 0
@@ -99,7 +99,7 @@ async fn client_settings_header_table_size() {
async fn server_settings_header_table_size() {
// A client sets the SETTINGS_HEADER_TABLE_SIZE to 0, test that the
// server doesn't send indexed headers.
let _ = env_logger::try_init();
h2_support::trace_init!();
let io = mock_io::Builder::new()
.read(MAGIC_PREFACE)

52
tests/h2-tests/tests/flow_control.rs
View File

@@ -7,7 +7,7 @@ use h2_support::util::yield_once;
// explicitly requested.
#[tokio::test]
async fn send_data_without_requesting_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 1024];
@@ -53,7 +53,7 @@ async fn send_data_without_requesting_capacity() {
#[tokio::test]
async fn release_capacity_sends_window_update() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0u8; 16_384];
let payload_len = payload.len();
@@ -120,7 +120,7 @@ async fn release_capacity_sends_window_update() {
#[tokio::test]
async fn release_capacity_of_small_amount_does_not_send_window_update() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = [0; 16];
@@ -175,7 +175,7 @@ fn expand_window_calls_are_coalesced() {}
#[tokio::test]
async fn recv_data_overflows_connection_window() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
@@ -238,7 +238,7 @@ async fn recv_data_overflows_connection_window() {
#[tokio::test]
async fn recv_data_overflows_stream_window() {
// this tests for when streams have smaller windows than their connection
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
@@ -295,7 +295,7 @@ fn recv_window_update_causes_overflow() {
#[tokio::test]
async fn stream_error_release_connection_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -371,7 +371,7 @@ async fn stream_error_release_connection_capacity() {
#[tokio::test]
async fn stream_close_by_data_frame_releases_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let window_size = frame::DEFAULT_INITIAL_WINDOW_SIZE as usize;
@@ -443,7 +443,7 @@ async fn stream_close_by_data_frame_releases_capacity() {
#[tokio::test]
async fn stream_close_by_trailers_frame_releases_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let window_size = frame::DEFAULT_INITIAL_WINDOW_SIZE as usize;
@@ -516,7 +516,7 @@ async fn stream_close_by_trailers_frame_releases_capacity() {
#[tokio::test]
async fn stream_close_by_send_reset_frame_releases_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -575,7 +575,7 @@ fn stream_close_by_recv_reset_frame_releases_capacity() {}
#[tokio::test]
async fn recv_window_update_on_stream_closed_by_data_frame() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -620,7 +620,7 @@ async fn recv_window_update_on_stream_closed_by_data_frame() {
#[tokio::test]
async fn reserved_capacity_assigned_in_multi_window_updates() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -685,7 +685,7 @@ async fn reserved_capacity_assigned_in_multi_window_updates() {
async fn connection_notified_on_released_capacity() {
use tokio::sync::{mpsc, oneshot};
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
// We're going to run the connection on a thread in order to isolate task
@@ -794,7 +794,7 @@ async fn connection_notified_on_released_capacity() {
#[tokio::test]
async fn recv_settings_removes_available_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mut settings = frame::Settings::default();
@@ -841,7 +841,7 @@ async fn recv_settings_removes_available_capacity() {
#[tokio::test]
async fn recv_settings_keeps_assigned_capacity() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let (sent_settings, sent_settings_rx) = futures::channel::oneshot::channel();
@@ -886,7 +886,7 @@ async fn recv_settings_keeps_assigned_capacity() {
#[tokio::test]
async fn recv_no_init_window_then_receive_some_init_window() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mut settings = frame::Settings::default();
@@ -942,7 +942,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
use futures::channel::oneshot;
use futures::future::{select, Either};
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let (tx1, rx1) = oneshot::channel();
let (tx2, rx2) = oneshot::channel();
@@ -1049,7 +1049,7 @@ async fn settings_lowered_capacity_returns_capacity_to_connection() {
#[tokio::test]
async fn client_increase_target_window_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1069,7 +1069,7 @@ async fn client_increase_target_window_size() {
#[tokio::test]
async fn increase_target_window_size_after_using_some() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1110,7 +1110,7 @@ async fn increase_target_window_size_after_using_some() {
#[tokio::test]
async fn decrease_target_window_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1155,7 +1155,7 @@ async fn decrease_target_window_size() {
#[tokio::test]
async fn client_update_initial_window_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let window_size = frame::DEFAULT_INITIAL_WINDOW_SIZE * 2;
@@ -1230,7 +1230,7 @@ async fn client_update_initial_window_size() {
#[tokio::test]
async fn client_decrease_initial_window_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1355,7 +1355,7 @@ async fn client_decrease_initial_window_size() {
#[tokio::test]
async fn server_target_window_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -1377,7 +1377,7 @@ async fn server_target_window_size() {
#[tokio::test]
async fn recv_settings_increase_window_size_after_using_some() {
// See https://github.com/hyperium/h2/issues/208
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let new_win_size = 16_384 * 4; // 1 bigger than default
@@ -1419,7 +1419,7 @@ async fn recv_settings_increase_window_size_after_using_some() {
#[tokio::test]
async fn reserve_capacity_after_peer_closes() {
// See https://github.com/hyperium/h2/issues/300
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -1456,7 +1456,7 @@ async fn reserve_capacity_after_peer_closes() {
async fn reset_stream_waiting_for_capacity() {
// This tests that receiving a reset on a stream that has some available
// connection-level window reassigns that window to another stream.
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
@@ -1517,7 +1517,7 @@ async fn reset_stream_waiting_for_capacity() {
#[tokio::test]
async fn data_padding() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mut body = Vec::new();

10
tests/h2-tests/tests/ping_pong.rs
View File

@@ -6,7 +6,7 @@ use h2_support::prelude::*;
#[tokio::test]
async fn recv_single_ping() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (m, mut mock) = mock::new();
// Create the handshake
@@ -36,7 +36,7 @@ async fn recv_single_ping() {
#[tokio::test]
async fn recv_multiple_pings() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -58,7 +58,7 @@ async fn recv_multiple_pings() {
#[tokio::test]
async fn pong_has_highest_priority() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let data = Bytes::from(vec![0; 16_384]);
@@ -96,7 +96,7 @@ async fn pong_has_highest_priority() {
#[tokio::test]
async fn user_ping_pong() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -138,7 +138,7 @@ async fn user_ping_pong() {
#[tokio::test]
async fn user_notifies_when_connection_closes() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
let settings = srv.assert_client_handshake().await;

12
tests/h2-tests/tests/prioritization.rs
View File

@@ -6,7 +6,7 @@ use std::task::Context;
#[tokio::test]
async fn single_stream_send_large_body() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 1024];
@@ -66,7 +66,7 @@ async fn single_stream_send_large_body() {
#[tokio::test]
async fn multiple_streams_with_payload_greater_than_default_window() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 16384 * 5 - 1];
let payload_clone = payload.clone();
@@ -129,7 +129,7 @@ async fn multiple_streams_with_payload_greater_than_default_window() {
#[tokio::test]
async fn single_stream_send_extra_large_body_multi_frames_one_buffer() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 32_768];
@@ -193,7 +193,7 @@ async fn single_stream_send_extra_large_body_multi_frames_one_buffer() {
#[tokio::test]
async fn single_stream_send_body_greater_than_default_window() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 16384 * 5 - 1];
@@ -279,7 +279,7 @@ async fn single_stream_send_body_greater_than_default_window() {
#[tokio::test]
async fn single_stream_send_extra_large_body_multi_frames_multi_buffer() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let payload = vec![0; 32_768];
@@ -341,7 +341,7 @@ async fn single_stream_send_extra_large_body_multi_frames_multi_buffer() {
#[tokio::test]
async fn send_data_receive_window_update() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (m, mut mock) = mock::new();
let h2 = async move {

16
tests/h2-tests/tests/push_promise.rs
View File

@@ -4,7 +4,7 @@ use h2_support::prelude::*;
#[tokio::test]
async fn recv_push_works() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {
@@ -62,7 +62,7 @@ async fn recv_push_works() {
#[tokio::test]
async fn pushed_streams_arent_dropped_too_early() {
// tests that by default, received push promises work
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {
@@ -128,7 +128,7 @@ async fn pushed_streams_arent_dropped_too_early() {
#[tokio::test]
async fn recv_push_when_push_disabled_is_conn_error() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {
@@ -186,7 +186,7 @@ async fn recv_push_when_push_disabled_is_conn_error() {
#[tokio::test]
async fn pending_push_promises_reset_when_dropped() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -233,7 +233,7 @@ async fn pending_push_promises_reset_when_dropped() {
#[tokio::test]
async fn recv_push_promise_over_max_header_list_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -284,7 +284,7 @@ async fn recv_push_promise_over_max_header_list_size() {
#[tokio::test]
async fn recv_invalid_push_promise_headers_is_stream_protocol_error() {
// Unsafe method or content length is stream protocol error
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {
@@ -348,7 +348,7 @@ fn recv_push_promise_with_wrong_authority_is_stream_error() {
#[tokio::test]
async fn recv_push_promise_skipped_stream_id() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {
@@ -402,7 +402,7 @@ async fn recv_push_promise_skipped_stream_id() {
#[tokio::test]
async fn recv_push_promise_dup_stream_id() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let mock = async move {

44
tests/h2-tests/tests/server.rs
View File

@@ -10,7 +10,7 @@ const SETTINGS_ACK: &'static [u8] = &[0, 0, 0, 4, 1, 0, 0, 0, 0];
#[tokio::test]
async fn read_preface_in_multiple_frames() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.read(b"PRI * HTTP/2.0")
@@ -28,7 +28,7 @@ async fn read_preface_in_multiple_frames() {
#[tokio::test]
async fn server_builder_set_max_concurrent_streams() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let mut settings = frame::Settings::default();
@@ -72,7 +72,7 @@ async fn server_builder_set_max_concurrent_streams() {
#[tokio::test]
async fn serve_request() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -107,7 +107,7 @@ async fn serve_request() {
#[tokio::test]
async fn serve_connect() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -138,7 +138,7 @@ async fn serve_connect() {
#[tokio::test]
async fn push_request() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -222,7 +222,7 @@ async fn push_request() {
#[tokio::test]
async fn push_request_against_concurrency() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -306,7 +306,7 @@ async fn push_request_against_concurrency() {
#[tokio::test]
async fn push_request_with_data() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -372,7 +372,7 @@ async fn push_request_with_data() {
#[tokio::test]
async fn push_request_between_data() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -443,7 +443,7 @@ fn accept_with_pending_connections_after_socket_close() {}
#[tokio::test]
async fn recv_invalid_authority() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let bad_auth = util::byte_str("not:a/good authority");
@@ -470,7 +470,7 @@ async fn recv_invalid_authority() {
#[tokio::test]
async fn recv_connection_header() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let req = |id, name, val| {
@@ -507,7 +507,7 @@ async fn recv_connection_header() {
#[tokio::test]
async fn sends_reset_cancel_when_req_body_is_dropped() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -539,7 +539,7 @@ async fn sends_reset_cancel_when_req_body_is_dropped() {
#[tokio::test]
async fn abrupt_shutdown() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -583,7 +583,7 @@ async fn abrupt_shutdown() {
#[tokio::test]
async fn graceful_shutdown() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -658,7 +658,7 @@ async fn graceful_shutdown() {
#[tokio::test]
async fn goaway_even_if_client_sent_goaway() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -707,7 +707,7 @@ async fn goaway_even_if_client_sent_goaway() {
#[tokio::test]
async fn sends_reset_cancel_when_res_body_is_dropped() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -761,7 +761,7 @@ async fn sends_reset_cancel_when_res_body_is_dropped() {
#[tokio::test]
async fn too_big_headers_sends_431() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -797,7 +797,7 @@ async fn too_big_headers_sends_431() {
#[tokio::test]
async fn too_big_headers_sends_reset_after_431_if_not_eos() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -832,7 +832,7 @@ async fn too_big_headers_sends_reset_after_431_if_not_eos() {
#[tokio::test]
async fn poll_reset() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -872,7 +872,7 @@ async fn poll_reset() {
#[tokio::test]
async fn poll_reset_io_error() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -913,7 +913,7 @@ async fn poll_reset_io_error() {
#[tokio::test]
async fn poll_reset_after_send_response_is_user_error() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {
@@ -967,7 +967,7 @@ async fn poll_reset_after_send_response_is_user_error() {
#[tokio::test]
async fn server_error_on_unclean_shutdown() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let srv = server::Builder::new().handshake::<_, Bytes>(io);
@@ -980,7 +980,7 @@ async fn server_error_on_unclean_shutdown() {
#[tokio::test]
async fn request_without_authority() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let client = async move {

42
tests/h2-tests/tests/stream_states.rs
View File

@@ -9,7 +9,7 @@ use tokio::sync::oneshot;
#[tokio::test]
async fn send_recv_headers_only() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -42,7 +42,7 @@ async fn send_recv_headers_only() {
#[tokio::test]
async fn send_recv_data() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -104,7 +104,7 @@ async fn send_recv_data() {
#[tokio::test]
async fn send_headers_recv_data_single_frame() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -153,7 +153,7 @@ async fn send_headers_recv_data_single_frame() {
#[tokio::test]
async fn closed_streams_are_released() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -196,7 +196,7 @@ async fn closed_streams_are_released() {
#[tokio::test]
async fn errors_if_recv_frame_exceeds_max_frame_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -239,7 +239,7 @@ async fn errors_if_recv_frame_exceeds_max_frame_size() {
#[tokio::test]
async fn configure_max_frame_size() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let h2 = async move {
@@ -278,7 +278,7 @@ async fn configure_max_frame_size() {
#[tokio::test]
async fn recv_goaway_finishes_processed_streams() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -332,7 +332,7 @@ async fn recv_goaway_finishes_processed_streams() {
#[tokio::test]
async fn recv_goaway_with_higher_last_processed_id() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -366,7 +366,7 @@ async fn recv_goaway_with_higher_last_processed_id() {
#[tokio::test]
async fn recv_next_stream_id_updated_by_malformed_headers() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut client) = mock::new();
let bad_auth = util::byte_str("not:a/good authority");
@@ -404,7 +404,7 @@ async fn recv_next_stream_id_updated_by_malformed_headers() {
#[tokio::test]
async fn skipped_stream_ids_are_implicitly_closed() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -445,7 +445,7 @@ async fn skipped_stream_ids_are_implicitly_closed() {
#[tokio::test]
async fn send_rst_stream_allows_recv_data() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -490,7 +490,7 @@ async fn send_rst_stream_allows_recv_data() {
#[tokio::test]
async fn send_rst_stream_allows_recv_trailers() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -531,7 +531,7 @@ async fn send_rst_stream_allows_recv_trailers() {
#[tokio::test]
async fn rst_stream_expires() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -582,7 +582,7 @@ async fn rst_stream_expires() {
#[tokio::test]
async fn rst_stream_max() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -653,7 +653,7 @@ async fn rst_stream_max() {
#[tokio::test]
async fn reserved_state_recv_window_update() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {
@@ -692,7 +692,7 @@ async fn reserved_state_recv_window_update() {
/*
#[test]
fn send_data_after_headers_eos() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -733,7 +733,7 @@ async fn rst_while_closing() {
// Test to reproduce panic in issue #246 --- receipt of a RST_STREAM frame
// on a stream in the Half Closed (remote) state with a queued EOS causes
// a panic.
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
// Rendevous when we've queued a trailers frame
@@ -794,7 +794,7 @@ async fn rst_with_buffered_data() {
// the data is fully flushed. Given that resetting a stream requires
// clearing all associated state for that stream, this test ensures that the
// buffered up frame is correctly handled.
let _ = env_logger::try_init();
h2_support::trace_init!();
// This allows the settings + headers frame through
let (io, mut srv) = mock::new_with_write_capacity(73);
@@ -846,7 +846,7 @@ async fn err_with_buffered_data() {
// the data is fully flushed. Given that resetting a stream requires
// clearing all associated state for that stream, this test ensures that the
// buffered up frame is correctly handled.
let _ = env_logger::try_init();
h2_support::trace_init!();
// This allows the settings + headers frame through
let (io, mut srv) = mock::new_with_write_capacity(73);
@@ -901,7 +901,7 @@ async fn send_err_with_buffered_data() {
// the data is fully flushed. Given that resetting a stream requires
// clearing all associated state for that stream, this test ensures that the
// buffered up frame is correctly handled.
let _ = env_logger::try_init();
h2_support::trace_init!();
// This allows the settings + headers frame through
let (io, mut srv) = mock::new_with_write_capacity(73);
@@ -963,7 +963,7 @@ async fn send_err_with_buffered_data() {
#[tokio::test]
async fn srv_window_update_on_lower_stream_id() {
// See https://github.com/hyperium/h2/issues/208
let _ = env_logger::try_init();
h2_support::trace_init!();
let (io, mut srv) = mock::new();
let srv = async move {

4
tests/h2-tests/tests/trailers.rs
View File

@@ -3,7 +3,7 @@ use h2_support::prelude::*;
#[tokio::test]
async fn recv_trailers_only() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()
@@ -53,7 +53,7 @@ async fn recv_trailers_only() {
#[tokio::test]
async fn send_trailers_immediately() {
let _ = env_logger::try_init();
h2_support::trace_init!();
let mock = mock_io::Builder::new()
.handshake()