From df52004032708a61599264d2693c919a519c004e Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Wed, 20 Jul 2022 16:18:45 -0700 Subject: [PATCH] [iwyu] Add test/core/end2end (#29998) * [iwyu] Add test/core/end2end * Automated change: Fix sanity tests * fix * fix * fix * fix * fix * fix * fix * update * fix Co-authored-by: ctiller --- test/core/end2end/bad_server_response_test.cc | 20 +++++++++-- test/core/end2end/connection_refused_test.cc | 10 ++++-- test/core/end2end/cq_verifier.cc | 14 ++++---- test/core/end2end/cq_verifier.h | 7 ++-- test/core/end2end/dualstack_socket_test.cc | 15 +++++++-- test/core/end2end/end2end_test_utils.cc | 3 +- test/core/end2end/end2end_tests.h | 6 ++++ test/core/end2end/fixtures/h2_census.cc | 12 +++---- test/core/end2end/fixtures/h2_compress.cc | 13 +++----- test/core/end2end/fixtures/h2_fakesec.cc | 8 +++-- test/core/end2end/fixtures/h2_fd.cc | 3 ++ test/core/end2end/fixtures/h2_full+pipe.cc | 12 +++---- test/core/end2end/fixtures/h2_full+trace.cc | 18 +++++----- test/core/end2end/fixtures/h2_full.cc | 11 ++----- .../core/end2end/fixtures/h2_full_no_retry.cc | 12 +++---- test/core/end2end/fixtures/h2_http_proxy.cc | 10 ++---- test/core/end2end/fixtures/h2_insecure.cc | 5 ++- .../h2_local_abstract_uds_percent_encoded.cc | 7 +++- test/core/end2end/fixtures/h2_local_ipv4.cc | 5 ++- test/core/end2end/fixtures/h2_local_ipv6.cc | 5 ++- test/core/end2end/fixtures/h2_local_uds.cc | 6 +++- .../fixtures/h2_local_uds_percent_encoded.cc | 6 +++- test/core/end2end/fixtures/h2_oauth2.cc | 10 +++++- test/core/end2end/fixtures/h2_proxy.cc | 11 ++----- .../end2end/fixtures/h2_sockpair+trace.cc | 33 ++++++++++++------- test/core/end2end/fixtures/h2_sockpair.cc | 25 +++++++++----- .../end2end/fixtures/h2_sockpair_1byte.cc | 26 ++++++++++----- test/core/end2end/fixtures/h2_ssl.cc | 14 +++++--- .../end2end/fixtures/h2_ssl_cred_reload.cc | 14 +++++--- test/core/end2end/fixtures/h2_ssl_proxy.cc | 12 ++++--- test/core/end2end/fixtures/h2_tls.cc | 18 ++++++---- test/core/end2end/fixtures/h2_uds.cc | 16 +++------ .../end2end/fixtures/http_proxy_fixture.cc | 17 +++++++--- test/core/end2end/fixtures/inproc.cc | 8 +---- test/core/end2end/fixtures/local_util.cc | 17 +++------- test/core/end2end/fixtures/local_util.h | 6 ++-- test/core/end2end/fixtures/proxy.cc | 12 +++++-- test/core/end2end/fuzzers/api_fuzzer.cc | 33 +++++++++++++++++++ test/core/end2end/fuzzers/client_fuzzer.cc | 17 ++++++++-- test/core/end2end/fuzzers/server_fuzzer.cc | 13 ++++++++ test/core/end2end/goaway_server_test.cc | 26 ++++++++++++++- .../core/end2end/h2_ssl_session_reuse_test.cc | 19 +++++++---- test/core/end2end/inproc_callback_test.cc | 10 +++--- .../end2end/invalid_call_argument_test.cc | 14 ++++++-- .../end2end/multiple_server_queues_test.cc | 1 + test/core/end2end/no_server_test.cc | 7 +++- .../end2end/tests/authority_not_supported.cc | 9 +++-- test/core/end2end/tests/bad_hostname.cc | 10 +++--- test/core/end2end/tests/bad_ping.cc | 9 +++-- test/core/end2end/tests/binary_metadata.cc | 11 +++++-- test/core/end2end/tests/call_creds.cc | 10 +++--- test/core/end2end/tests/call_host_override.cc | 9 ++--- .../core/end2end/tests/cancel_after_accept.cc | 9 +++-- .../end2end/tests/cancel_after_client_done.cc | 9 +++-- .../core/end2end/tests/cancel_after_invoke.cc | 7 ++-- .../end2end/tests/cancel_after_round_trip.cc | 9 +++-- .../end2end/tests/cancel_before_invoke.cc | 7 ++-- test/core/end2end/tests/cancel_in_a_vacuum.cc | 11 +++---- test/core/end2end/tests/cancel_test_helpers.h | 1 + test/core/end2end/tests/cancel_with_status.cc | 7 ++-- test/core/end2end/tests/channelz.cc | 16 +++++---- test/core/end2end/tests/client_streaming.cc | 9 +++-- test/core/end2end/tests/compressed_payload.cc | 11 ++++--- test/core/end2end/tests/connectivity.cc | 4 +++ test/core/end2end/tests/default_host.cc | 9 ++--- .../core/end2end/tests/disappearing_server.cc | 10 +++--- test/core/end2end/tests/empty_batch.cc | 10 +++--- .../core/end2end/tests/filter_causes_close.cc | 16 ++++++--- test/core/end2end/tests/filter_context.cc | 20 ++++++++--- test/core/end2end/tests/filter_init_fails.cc | 17 +++++++--- test/core/end2end/tests/filter_latency.cc | 17 ++++++++-- test/core/end2end/tests/filter_status_code.cc | 22 ++++++++++--- test/core/end2end/tests/filtered_metadata.cc | 10 +++--- .../end2end/tests/graceful_server_shutdown.cc | 10 +++--- test/core/end2end/tests/grpc_authz.cc | 20 ++++++++--- test/core/end2end/tests/high_initial_seqno.cc | 10 +++--- test/core/end2end/tests/hpack_size.cc | 9 ++--- .../end2end/tests/invoke_large_request.cc | 9 +++-- test/core/end2end/tests/keepalive_timeout.cc | 14 +++++--- test/core/end2end/tests/large_metadata.cc | 8 +++-- .../end2end/tests/max_concurrent_streams.cc | 10 +++--- test/core/end2end/tests/max_connection_age.cc | 12 ++++++- .../core/end2end/tests/max_connection_idle.cc | 9 +++-- test/core/end2end/tests/max_message_length.cc | 10 +++--- test/core/end2end/tests/negative_deadline.cc | 7 ++-- .../core/end2end/tests/no_error_on_hotpath.cc | 10 +++--- test/core/end2end/tests/no_logging.cc | 12 ++++--- test/core/end2end/tests/no_op.cc | 9 ++--- test/core/end2end/tests/payload.cc | 8 ++++- test/core/end2end/tests/ping.cc | 5 ++- .../core/end2end/tests/ping_pong_streaming.cc | 9 +++-- test/core/end2end/tests/proxy_auth.cc | 13 +++----- test/core/end2end/tests/registered_call.cc | 10 +++--- test/core/end2end/tests/request_with_flags.cc | 9 +++-- .../end2end/tests/request_with_payload.cc | 9 +++-- .../end2end/tests/resource_quota_server.cc | 9 +++-- test/core/end2end/tests/retry.cc | 11 +++---- ...retry_cancel_after_first_attempt_starts.cc | 12 +++---- .../tests/retry_cancel_during_delay.cc | 11 +++++-- ...retry_cancel_with_multiple_send_batches.cc | 21 +++++++++--- test/core/end2end/tests/retry_cancellation.cc | 9 ++--- test/core/end2end/tests/retry_disabled.cc | 11 +++---- .../retry_exceeds_buffer_size_in_delay.cc | 10 +++--- ...ry_exceeds_buffer_size_in_initial_batch.cc | 11 +++---- ...exceeds_buffer_size_in_subsequent_batch.cc | 10 +++--- test/core/end2end/tests/retry_lb_drop.cc | 26 +++++++++++---- test/core/end2end/tests/retry_lb_fail.cc | 26 ++++++++++----- .../tests/retry_non_retriable_status.cc | 11 +++---- ...s_before_recv_trailing_metadata_started.cc | 11 +++---- .../tests/retry_per_attempt_recv_timeout.cc | 13 ++++---- ...er_attempt_recv_timeout_on_last_attempt.cc | 14 ++++---- .../tests/retry_recv_initial_metadata.cc | 11 +++---- test/core/end2end/tests/retry_recv_message.cc | 11 +++---- .../tests/retry_recv_message_replay.cc | 21 ++++++++---- .../retry_recv_trailing_metadata_error.cc | 21 ++++++++---- .../tests/retry_send_initial_metadata_refs.cc | 13 ++++---- .../core/end2end/tests/retry_send_op_fails.cc | 21 ++++++++---- .../end2end/tests/retry_send_recv_batch.cc | 12 +++---- .../tests/retry_server_pushback_delay.cc | 15 ++++++--- .../tests/retry_server_pushback_disabled.cc | 11 +++---- test/core/end2end/tests/retry_streaming.cc | 15 +++++---- .../tests/retry_streaming_after_commit.cc | 11 +++---- ...reaming_succeeds_before_replay_finished.cc | 11 +++---- test/core/end2end/tests/retry_throttled.cc | 11 +++---- .../end2end/tests/retry_too_many_attempts.cc | 11 +++---- .../end2end/tests/retry_transparent_goaway.cc | 24 +++++++++----- ...etry_transparent_max_concurrent_streams.cc | 18 +++------- .../retry_transparent_not_sent_on_wire.cc | 24 +++++++++----- .../tests/retry_unref_before_finish.cc | 12 +++---- .../end2end/tests/retry_unref_before_recv.cc | 12 +++---- .../end2end/tests/server_finishes_request.cc | 10 +++--- test/core/end2end/tests/server_streaming.cc | 13 ++++++-- .../end2end/tests/shutdown_finishes_calls.cc | 9 +++-- .../end2end/tests/shutdown_finishes_tags.cc | 8 ++--- .../end2end/tests/simple_delayed_request.cc | 10 +++--- test/core/end2end/tests/simple_metadata.cc | 9 +++-- test/core/end2end/tests/simple_request.cc | 11 ++++--- .../end2end/tests/streaming_error_response.cc | 9 +++-- test/core/end2end/tests/trailing_metadata.cc | 9 +++-- test/core/end2end/tests/write_buffering.cc | 9 +++-- .../end2end/tests/write_buffering_at_end.cc | 9 +++-- tools/dockerfile/grpc_iwyu/iwyu.sh | 2 ++ 142 files changed, 1071 insertions(+), 636 deletions(-) diff --git a/test/core/end2end/bad_server_response_test.cc b/test/core/end2end/bad_server_response_test.cc index 57e05e457f9..7d31eafd2ca 100644 --- a/test/core/end2end/bad_server_response_test.cc +++ b/test/core/end2end/bad_server_response_test.cc @@ -16,21 +16,35 @@ * */ +#include #include #include +#include +#include +#include + #include #include +#include #include +#include +#include #include +#include #include +#include +#include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/thd.h" -#include "src/core/lib/iomgr/sockaddr.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/pollset.h" +#include "src/core/lib/iomgr/tcp_server.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/slice/slice_string_helpers.h" #include "test/core/end2end/cq_verifier.h" diff --git a/test/core/end2end/connection_refused_test.cc b/test/core/end2end/connection_refused_test.cc index 70a42898287..b925df78a0f 100644 --- a/test/core/end2end/connection_refused_test.cc +++ b/test/core/end2end/connection_refused_test.cc @@ -16,18 +16,22 @@ * */ +#include #include +#include + #include #include -#include +#include +#include +#include #include -#include +#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/cq_verifier.cc b/test/core/end2end/cq_verifier.cc index 946739b28db..a598bb8aa4d 100644 --- a/test/core/end2end/cq_verifier.cc +++ b/test/core/end2end/cq_verifier.cc @@ -19,31 +19,31 @@ #include "test/core/end2end/cq_verifier.h" #include -#include #include +#include #include -#include +#include #include +#include #include +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" #include "absl/strings/str_join.h" #include -#include +#include #include -#include +#include #include -#include #include -#include "src/core/lib/compression/compression_internal.h" #include "src/core/lib/compression/message_compress.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/match.h" #include "src/core/lib/surface/event_string.h" +#include "test/core/util/test_config.h" // a set of metadata we expect to find on an event typedef struct metadata { diff --git a/test/core/end2end/cq_verifier.h b/test/core/end2end/cq_verifier.h index 7459c6c9066..3bf00c58bc1 100644 --- a/test/core/end2end/cq_verifier.h +++ b/test/core/end2end/cq_verifier.h @@ -19,13 +19,16 @@ #ifndef GRPC_TEST_CORE_END2END_CQ_VERIFIER_H #define GRPC_TEST_CORE_END2END_CQ_VERIFIER_H -#include +#include +#include + +#include "absl/types/variant.h" #include +#include #include "src/core/lib/gprpp/debug_location.h" #include "src/core/lib/gprpp/time.h" -#include "test/core/util/test_config.h" namespace grpc_core { diff --git a/test/core/end2end/dualstack_socket_test.cc b/test/core/end2end/dualstack_socket_test.cc index a53d13b0802..03d48b56d09 100644 --- a/test/core/end2end/dualstack_socket_test.cc +++ b/test/core/end2end/dualstack_socket_test.cc @@ -16,7 +16,19 @@ * */ +#include + +#include +#include + +#include "absl/status/statusor.h" + +#include +#include +#include + #include "src/core/lib/iomgr/port.h" +#include "src/core/lib/iomgr/resolved_address.h" // This test won't work except with posix sockets enabled #ifdef GRPC_POSIX_SOCKET_EV @@ -34,15 +46,12 @@ #include #include #include -#include #include "src/core/lib/address_utils/sockaddr_utils.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/socket_utils_posix.h" -#include "src/core/lib/slice/slice_string_helpers.h" #include "src/core/lib/transport/error_utils.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" diff --git a/test/core/end2end/end2end_test_utils.cc b/test/core/end2end/end2end_test_utils.cc index c5927611b6d..329dc833608 100644 --- a/test/core/end2end/end2end_test_utils.cc +++ b/test/core/end2end/end2end_test_utils.cc @@ -16,8 +16,7 @@ * */ -#include - +#include #include #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/end2end_tests.h b/test/core/end2end/end2end_tests.h index aafef3aaaf1..e77b1253bb6 100644 --- a/test/core/end2end/end2end_tests.h +++ b/test/core/end2end/end2end_tests.h @@ -19,7 +19,13 @@ #ifndef GRPC_TEST_CORE_END2END_END2END_TESTS_H #define GRPC_TEST_CORE_END2END_END2END_TESTS_H +#include + #include +#include + +struct grpc_end2end_test_config; +struct grpc_end2end_test_fixture; typedef struct grpc_end2end_test_fixture grpc_end2end_test_fixture; typedef struct grpc_end2end_test_config grpc_end2end_test_config; diff --git a/test/core/end2end/fixtures/h2_census.cc b/test/core/end2end/fixtures/h2_census.cc index 8fca3e7889b..e6553fbd147 100644 --- a/test/core/end2end/fixtures/h2_census.cc +++ b/test/core/end2end/fixtures/h2_census.cc @@ -18,19 +18,15 @@ #include +#include + +#include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_compress.cc b/test/core/end2end/fixtures/h2_compress.cc index ab3ac8e0636..6f51ec2648c 100644 --- a/test/core/end2end/fixtures/h2_compress.cc +++ b/test/core/end2end/fixtures/h2_compress.cc @@ -18,19 +18,16 @@ #include +#include + +#include +#include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/compression/args_utils.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" diff --git a/test/core/end2end/fixtures/h2_fakesec.cc b/test/core/end2end/fixtures/h2_fakesec.cc index b1e5dc69a4f..506be9272bf 100644 --- a/test/core/end2end/fixtures/h2_fakesec.cc +++ b/test/core/end2end/fixtures/h2_fakesec.cc @@ -16,13 +16,15 @@ * */ -#include #include -#include +#include + +#include +#include +#include #include -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/security/credentials/fake/fake_credentials.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/h2_fd.cc b/test/core/end2end/fixtures/h2_fd.cc index 77d6142b3be..e7513789805 100644 --- a/test/core/end2end/fixtures/h2_fd.cc +++ b/test/core/end2end/fixtures/h2_fd.cc @@ -16,6 +16,9 @@ * */ +#include "absl/status/status.h" + +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/port.h" // This test won't work except with posix sockets enabled diff --git a/test/core/end2end/fixtures/h2_full+pipe.cc b/test/core/end2end/fixtures/h2_full+pipe.cc index 393e7d224d2..65670cf82ba 100644 --- a/test/core/end2end/fixtures/h2_full+pipe.cc +++ b/test/core/end2end/fixtures/h2_full+pipe.cc @@ -16,6 +16,10 @@ * */ +#include + +#include + #include "src/core/lib/iomgr/port.h" // This test requires posix wakeup fds @@ -24,18 +28,10 @@ #include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/wakeup_fd_posix.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full+trace.cc b/test/core/end2end/fixtures/h2_full+trace.cc index 613a83e131c..79e21a32165 100644 --- a/test/core/end2end/fixtures/h2_full+trace.cc +++ b/test/core/end2end/fixtures/h2_full+trace.cc @@ -16,25 +16,27 @@ * */ +#include + #include + +#include + +#include "src/core/lib/iomgr/port.h" // IWYU pragma: keep + #ifdef GRPC_POSIX_SOCKET #include #endif +#include + #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full.cc b/test/core/end2end/fixtures/h2_full.cc index bf549a520b3..4f4ec865aca 100644 --- a/test/core/end2end/fixtures/h2_full.cc +++ b/test/core/end2end/fixtures/h2_full.cc @@ -18,18 +18,13 @@ #include +#include + +#include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_full_no_retry.cc b/test/core/end2end/fixtures/h2_full_no_retry.cc index d69f502f273..820ae12781b 100644 --- a/test/core/end2end/fixtures/h2_full_no_retry.cc +++ b/test/core/end2end/fixtures/h2_full_no_retry.cc @@ -18,18 +18,14 @@ #include +#include + +#include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_http_proxy.cc b/test/core/end2end/fixtures/h2_http_proxy.cc index abf7bc400bc..155070cdc86 100644 --- a/test/core/end2end/fixtures/h2_http_proxy.cc +++ b/test/core/end2end/fixtures/h2_http_proxy.cc @@ -22,19 +22,13 @@ #include "absl/strings/str_format.h" +#include #include -#include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/env.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" #include "test/core/util/port.h" diff --git a/test/core/end2end/fixtures/h2_insecure.cc b/test/core/end2end/fixtures/h2_insecure.cc index d1eb2e286f9..df8d529a6b7 100644 --- a/test/core/end2end/fixtures/h2_insecure.cc +++ b/test/core/end2end/fixtures/h2_insecure.cc @@ -18,8 +18,11 @@ #include +#include + +#include #include -#include +#include #include #include "src/core/lib/channel/channel_args.h" diff --git a/test/core/end2end/fixtures/h2_local_abstract_uds_percent_encoded.cc b/test/core/end2end/fixtures/h2_local_abstract_uds_percent_encoded.cc index 51f3042165e..02ffbedb4d0 100644 --- a/test/core/end2end/fixtures/h2_local_abstract_uds_percent_encoded.cc +++ b/test/core/end2end/fixtures/h2_local_abstract_uds_percent_encoded.cc @@ -12,11 +12,16 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include #include +#include + #include "absl/strings/str_format.h" -#include +#include +#include +#include #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/local_util.h" diff --git a/test/core/end2end/fixtures/h2_local_ipv4.cc b/test/core/end2end/fixtures/h2_local_ipv4.cc index a8f36a40710..0160253faf6 100644 --- a/test/core/end2end/fixtures/h2_local_ipv4.cc +++ b/test/core/end2end/fixtures/h2_local_ipv4.cc @@ -18,7 +18,10 @@ #include -#include +#include + +#include +#include #include "src/core/lib/gprpp/host_port.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/h2_local_ipv6.cc b/test/core/end2end/fixtures/h2_local_ipv6.cc index c616d6be2c1..c441391fc86 100644 --- a/test/core/end2end/fixtures/h2_local_ipv6.cc +++ b/test/core/end2end/fixtures/h2_local_ipv6.cc @@ -18,7 +18,10 @@ #include -#include +#include + +#include +#include #include "src/core/lib/gprpp/host_port.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/h2_local_uds.cc b/test/core/end2end/fixtures/h2_local_uds.cc index a78174f3b61..91756e18795 100644 --- a/test/core/end2end/fixtures/h2_local_uds.cc +++ b/test/core/end2end/fixtures/h2_local_uds.cc @@ -19,9 +19,13 @@ #include #include +#include + #include "absl/strings/str_format.h" -#include +#include +#include +#include #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/local_util.h" diff --git a/test/core/end2end/fixtures/h2_local_uds_percent_encoded.cc b/test/core/end2end/fixtures/h2_local_uds_percent_encoded.cc index 3a101619162..495f4bb95a4 100644 --- a/test/core/end2end/fixtures/h2_local_uds_percent_encoded.cc +++ b/test/core/end2end/fixtures/h2_local_uds_percent_encoded.cc @@ -19,9 +19,13 @@ #include #include +#include + #include "absl/strings/str_format.h" -#include +#include +#include +#include #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/local_util.h" diff --git a/test/core/end2end/fixtures/h2_oauth2.cc b/test/core/end2end/fixtures/h2_oauth2.cc index 0837fc895dc..ef5156fc67e 100644 --- a/test/core/end2end/fixtures/h2_oauth2.cc +++ b/test/core/end2end/fixtures/h2_oauth2.cc @@ -19,12 +19,20 @@ #include #include +#include + +#include +#include +#include +#include +#include #include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" #include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" diff --git a/test/core/end2end/fixtures/h2_proxy.cc b/test/core/end2end/fixtures/h2_proxy.cc index d22e60d8394..a0cea0bd3bb 100644 --- a/test/core/end2end/fixtures/h2_proxy.cc +++ b/test/core/end2end/fixtures/h2_proxy.cc @@ -18,20 +18,13 @@ #include +#include #include #include #include -#include - -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" + #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/proxy.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" typedef struct fullstack_fixture_data { diff --git a/test/core/end2end/fixtures/h2_sockpair+trace.cc b/test/core/end2end/fixtures/h2_sockpair+trace.cc index b84a6f599cb..8e174471459 100644 --- a/test/core/end2end/fixtures/h2_sockpair+trace.cc +++ b/test/core/end2end/fixtures/h2_sockpair+trace.cc @@ -17,32 +17,41 @@ */ #include -#ifdef GRPC_POSIX_SOCKET -#include -#endif +#include "absl/status/status.h" +#include "absl/status/statusor.h" + +#include +#include #include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/client/http_client_filter.h" -#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/debug/trace.h" +#include "src/core/lib/gprpp/global_config_generic.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/port.h" -#include "src/core/lib/resource_quota/api.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" +#ifdef GRPC_POSIX_SOCKET +#include +#endif + /* chttp2 transport that is immediately available (used for testing connected_channel without a client_channel */ diff --git a/test/core/end2end/fixtures/h2_sockpair.cc b/test/core/end2end/fixtures/h2_sockpair.cc index df9eb3b92ea..613c49dc52b 100644 --- a/test/core/end2end/fixtures/h2_sockpair.cc +++ b/test/core/end2end/fixtures/h2_sockpair.cc @@ -18,24 +18,31 @@ #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" + +#include +#include #include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/client/http_client_filter.h" -#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/iomgr/iomgr.h" -#include "src/core/lib/resource_quota/api.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" /* chttp2 transport that is immediately available (used for testing diff --git a/test/core/end2end/fixtures/h2_sockpair_1byte.cc b/test/core/end2end/fixtures/h2_sockpair_1byte.cc index 88166fc8fe6..72c1e9afc56 100644 --- a/test/core/end2end/fixtures/h2_sockpair_1byte.cc +++ b/test/core/end2end/fixtures/h2_sockpair_1byte.cc @@ -18,24 +18,32 @@ #include +#include "absl/status/status.h" +#include "absl/status/statusor.h" + +#include +#include #include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/client/http_client_filter.h" -#include "src/core/ext/filters/http/message_compress/message_compress_filter.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/endpoint_pair.h" -#include "src/core/lib/iomgr/iomgr.h" -#include "src/core/lib/resource_quota/api.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" /* chttp2 transport that is immediately available (used for testing diff --git a/test/core/end2end/fixtures/h2_ssl.cc b/test/core/end2end/fixtures/h2_ssl.cc index e4df563e088..af8c1b09168 100644 --- a/test/core/end2end/fixtures/h2_ssl.cc +++ b/test/core/end2end/fixtures/h2_ssl.cc @@ -16,18 +16,22 @@ * */ -#include #include -#include +#include + +#include +#include +#include +#include +#include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc index bce43b05c90..6b73cd84960 100644 --- a/test/core/end2end/fixtures/h2_ssl_cred_reload.cc +++ b/test/core/end2end/fixtures/h2_ssl_cred_reload.cc @@ -16,18 +16,22 @@ * */ -#include #include -#include +#include + +#include +#include +#include +#include +#include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/ssl/ssl_credentials.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/end2end_tests.h" diff --git a/test/core/end2end/fixtures/h2_ssl_proxy.cc b/test/core/end2end/fixtures/h2_ssl_proxy.cc index 0d2052d47db..10befbcc7db 100644 --- a/test/core/end2end/fixtures/h2_ssl_proxy.cc +++ b/test/core/end2end/fixtures/h2_ssl_proxy.cc @@ -16,21 +16,23 @@ * */ -#include #include +#include +#include +#include +#include #include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/gprpp/global_config_generic.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/proxy.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" #define CA_CERT_PATH "src/core/tsi/test_creds/ca.pem" diff --git a/test/core/end2end/fixtures/h2_tls.cc b/test/core/end2end/fixtures/h2_tls.cc index 567c218b352..cc92b6178c7 100644 --- a/test/core/end2end/fixtures/h2_tls.cc +++ b/test/core/end2end/fixtures/h2_tls.cc @@ -16,26 +16,30 @@ * */ -#include +#include #include +#include + #include "absl/container/inlined_vector.h" +#include "absl/strings/string_view.h" +#include #include -#include +#include +#include +#include #include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/env.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" +#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/fixtures/h2_uds.cc b/test/core/end2end/fixtures/h2_uds.cc index c7173566e43..f644e696e45 100644 --- a/test/core/end2end/fixtures/h2_uds.cc +++ b/test/core/end2end/fixtures/h2_uds.cc @@ -17,28 +17,20 @@ */ #include -#include #include #include #include +#include #include "absl/strings/str_format.h" +#include #include -#include #include -#include - -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" +#include + #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" struct fullstack_fixture_data { diff --git a/test/core/end2end/fixtures/http_proxy_fixture.cc b/test/core/end2end/fixtures/http_proxy_fixture.cc index 4b9bcf57c5b..bbc1ac2fbb9 100644 --- a/test/core/end2end/fixtures/http_proxy_fixture.cc +++ b/test/core/end2end/fixtures/http_proxy_fixture.cc @@ -21,37 +21,46 @@ #include #include +#include +#include +#include +#include + +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" #include +#include #include #include -#include #include #include #include "src/core/lib/address_utils/sockaddr_utils.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/host_port.h" #include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/thd.h" +#include "src/core/lib/gprpp/time.h" #include "src/core/lib/http/parser.h" #include "src/core/lib/iomgr/closure.h" #include "src/core/lib/iomgr/combiner.h" #include "src/core/lib/iomgr/endpoint.h" #include "src/core/lib/iomgr/error.h" #include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/pollset.h" #include "src/core/lib/iomgr/pollset_set.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/tcp_server.h" -#include "src/core/lib/iomgr/timer.h" -#include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/b64.h" #include "src/core/lib/slice/slice_internal.h" +#include "src/core/lib/slice/slice_refcount.h" #include "test/core/util/port.h" struct grpc_end2end_http_proxy { diff --git a/test/core/end2end/fixtures/inproc.cc b/test/core/end2end/fixtures/inproc.cc index 6aa1645b230..a375d49e904 100644 --- a/test/core/end2end/fixtures/inproc.cc +++ b/test/core/end2end/fixtures/inproc.cc @@ -18,18 +18,12 @@ #include +#include #include #include -#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/channel/connected_channel.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" typedef struct inproc_fixture_data { diff --git a/test/core/end2end/fixtures/local_util.cc b/test/core/end2end/fixtures/local_util.cc index 16fe4d0cfbe..8416f1dd9e1 100644 --- a/test/core/end2end/fixtures/local_util.cc +++ b/test/core/end2end/fixtures/local_util.cc @@ -18,20 +18,11 @@ #include "test/core/end2end/fixtures/local_util.h" -#include -#include -#include -#include +#include -#include "src/core/ext/filters/client_channel/client_channel.h" -#include "src/core/ext/filters/http/server/http_server_filter.h" -#include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" -#include "src/core/lib/channel/connected_channel.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/security/credentials/credentials.h" -#include "src/core/lib/surface/server.h" -#include "test/core/util/port.h" -#include "test/core/util/test_config.h" +#include +#include +#include grpc_end2end_test_fixture grpc_end2end_local_chttp2_create_fixture_fullstack() { grpc_end2end_test_fixture f; diff --git a/test/core/end2end/fixtures/local_util.h b/test/core/end2end/fixtures/local_util.h index 2d17b2b4577..dc9be0cba5a 100644 --- a/test/core/end2end/fixtures/local_util.h +++ b/test/core/end2end/fixtures/local_util.h @@ -16,9 +16,11 @@ * */ -#include +#include + +#include +#include -#include "src/core/lib/surface/channel.h" #include "test/core/end2end/end2end_tests.h" struct grpc_end2end_local_fullstack_fixture_data { diff --git a/test/core/end2end/fixtures/proxy.cc b/test/core/end2end/fixtures/proxy.cc index e11df81be05..7a80cfaf5a5 100644 --- a/test/core/end2end/fixtures/proxy.cc +++ b/test/core/end2end/fixtures/proxy.cc @@ -18,15 +18,23 @@ #include "test/core/end2end/fixtures/proxy.h" +#include #include +#include +#include + +#include +#include +#include +#include #include #include #include +#include -#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "src/core/lib/gprpp/thd.h" #include "src/core/lib/surface/call.h" #include "test/core/util/port.h" diff --git a/test/core/end2end/fuzzers/api_fuzzer.cc b/test/core/end2end/fuzzers/api_fuzzer.cc index 1e643d7b1a6..a2431bb22fa 100644 --- a/test/core/end2end/fuzzers/api_fuzzer.cc +++ b/test/core/end2end/fuzzers/api_fuzzer.cc @@ -16,24 +16,55 @@ * */ +#include #include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" +#include "absl/strings/string_view.h" +#include "absl/types/optional.h" + +#include +#include #include #include +#include +#include #include #include #include +#include #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/address_utils/parse_address.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channelz.h" #include "src/core/lib/event_engine/event_engine_factory.h" #include "src/core/lib/gpr/env.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolve_address.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/tcp_client.h" #include "src/core/lib/iomgr/timer.h" #include "src/core/lib/iomgr/timer_manager.h" @@ -41,10 +72,12 @@ #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport_fwd.h" #include "src/libfuzzer/libfuzzer_macro.h" #include "test/core/end2end/data/ssl_test_data.h" #include "test/core/end2end/fuzzers/api_fuzzer.pb.h" #include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.h" +#include "test/core/event_engine/fuzzing_event_engine/fuzzing_event_engine.pb.h" #include "test/core/util/passthru_endpoint.h" // Applicable when simulating channel actions. Prevents overflows. diff --git a/test/core/end2end/fuzzers/client_fuzzer.cc b/test/core/end2end/fuzzers/client_fuzzer.cc index cd14a14d96b..c4c57b8ff4d 100644 --- a/test/core/end2end/fuzzers/client_fuzzer.cc +++ b/test/core/end2end/fuzzers/client_fuzzer.cc @@ -16,18 +16,31 @@ * */ +#include #include +#include "absl/status/statusor.h" + +#include #include -#include -#include +#include +#include +#include +#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/util/mock_endpoint.h" bool squelch = true; diff --git a/test/core/end2end/fuzzers/server_fuzzer.cc b/test/core/end2end/fuzzers/server_fuzzer.cc index acd363327b7..c4fda22b9cf 100644 --- a/test/core/end2end/fuzzers/server_fuzzer.cc +++ b/test/core/end2end/fuzzers/server_fuzzer.cc @@ -16,15 +16,28 @@ * */ +#include +#include + #include +#include +#include +#include #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" +#include "src/core/lib/channel/channelz.h" +#include "src/core/lib/config/core_configuration.h" #include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/endpoint.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/executor.h" #include "src/core/lib/resource_quota/api.h" #include "src/core/lib/slice/slice_internal.h" #include "src/core/lib/surface/server.h" +#include "src/core/lib/transport/transport_fwd.h" #include "test/core/util/mock_endpoint.h" bool squelch = true; diff --git a/test/core/end2end/goaway_server_test.cc b/test/core/end2end/goaway_server_test.cc index 1ad3d742287..5fa58f95f8f 100644 --- a/test/core/end2end/goaway_server_test.cc +++ b/test/core/end2end/goaway_server_test.cc @@ -16,21 +16,45 @@ * */ +#include #include +#include +#include +#include #include +#include +#include +#include +#include "absl/memory/memory.h" +#include "absl/status/status.h" +#include "absl/status/statusor.h" #include "absl/strings/str_cat.h" +#include "absl/strings/string_view.h" +#include #include #include -#include +#include +#include +#include #include +#include +#include #include "src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_wrapper.h" +#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/event_engine/event_engine_factory.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/gprpp/time.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/iomgr_fwd.h" #include "src/core/lib/iomgr/resolve_address.h" #include "src/core/lib/iomgr/resolve_address_impl.h" +#include "src/core/lib/iomgr/resolved_address.h" #include "src/core/lib/iomgr/sockaddr.h" #include "src/core/lib/iomgr/socket_utils.h" #include "src/core/lib/resolver/server_address.h" diff --git a/test/core/end2end/h2_ssl_session_reuse_test.cc b/test/core/end2end/h2_ssl_session_reuse_test.cc index 1a085c829df..2f484ef206b 100644 --- a/test/core/end2end/h2_ssl_session_reuse_test.cc +++ b/test/core/end2end/h2_ssl_session_reuse_test.cc @@ -16,23 +16,30 @@ * */ -#include +#include #include +#include + #include -#include +#include +#include +#include +#include +#include +#include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/tmpfile.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/global_config_generic.h" #include "src/core/lib/gprpp/host_port.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/iomgr/load_file.h" -#include "src/core/lib/security/credentials/credentials.h" #include "src/core/lib/security/security_connector/ssl_utils_config.h" #include "test/core/end2end/cq_verifier.h" -#include "test/core/end2end/end2end_tests.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/inproc_callback_test.cc b/test/core/end2end/inproc_callback_test.cc index 13aed886a53..a4f1cf88620 100644 --- a/test/core/end2end/inproc_callback_test.cc +++ b/test/core/end2end/inproc_callback_test.cc @@ -16,18 +16,20 @@ * */ +#include #include +#include +#include +#include +#include #include #include #include +#include #include "src/core/ext/transport/inproc/inproc_transport.h" -#include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/completion_queue.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/util/port.h" #include "test/core/util/test_config.h" typedef struct inproc_fixture_data { diff --git a/test/core/end2end/invalid_call_argument_test.cc b/test/core/end2end/invalid_call_argument_test.cc index 4d5c2e9a87d..a8fc056d973 100644 --- a/test/core/end2end/invalid_call_argument_test.cc +++ b/test/core/end2end/invalid_call_argument_test.cc @@ -19,15 +19,25 @@ #include #include +#include #include +#include +#include +#include + +#include "absl/memory/memory.h" + +#include #include #include -#include +#include +#include +#include #include +#include #include "src/core/lib/gprpp/host_port.h" -#include "src/core/lib/gprpp/memory.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/multiple_server_queues_test.cc b/test/core/end2end/multiple_server_queues_test.cc index ba6e0bd7ae5..02887c6440c 100644 --- a/test/core/end2end/multiple_server_queues_test.cc +++ b/test/core/end2end/multiple_server_queues_test.cc @@ -18,6 +18,7 @@ #include #include +#include #include "test/core/util/test_config.h" diff --git a/test/core/end2end/no_server_test.cc b/test/core/end2end/no_server_test.cc index f2b3ff14da1..444895a45c4 100644 --- a/test/core/end2end/no_server_test.cc +++ b/test/core/end2end/no_server_test.cc @@ -16,14 +16,19 @@ * */ +#include #include #include #include -#include +#include +#include +#include #include +#include #include "src/core/ext/filters/client_channel/resolver/fake/fake_resolver.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" #include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/util/test_config.h" diff --git a/test/core/end2end/tests/authority_not_supported.cc b/test/core/end2end/tests/authority_not_supported.cc index 78180aebd41..0f96c571750 100644 --- a/test/core/end2end/tests/authority_not_supported.cc +++ b/test/core/end2end/tests/authority_not_supported.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/bad_hostname.cc b/test/core/end2end/tests/bad_hostname.cc index 440fbacc94a..97cba45485d 100644 --- a/test/core/end2end/tests/bad_hostname.cc +++ b/test/core/end2end/tests/bad_hostname.cc @@ -16,18 +16,18 @@ * */ -#include +#include #include -#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/bad_ping.cc b/test/core/end2end/tests/bad_ping.cc index 2aa6c62e9f4..16f173ee66c 100644 --- a/test/core/end2end/tests/bad_ping.cc +++ b/test/core/end2end/tests/bad_ping.cc @@ -16,18 +16,21 @@ * */ +#include #include -#include +#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/channel.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #define MAX_PING_STRIKES 2 diff --git a/test/core/end2end/tests/binary_metadata.cc b/test/core/end2end/tests/binary_metadata.cc index f2e90079639..1ffd8264daa 100644 --- a/test/core/end2end/tests/binary_metadata.cc +++ b/test/core/end2end/tests/binary_metadata.cc @@ -16,17 +16,22 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_args_preconditioning.h" #include "src/core/lib/config/core_configuration.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/call_creds.cc b/test/core/end2end/tests/call_creds.cc index 7a0b554ed82..74bcaf74d3a 100644 --- a/test/core/end2end/tests/call_creds.cc +++ b/test/core/end2end/tests/call_creds.cc @@ -16,19 +16,21 @@ * */ -#include +#include #include #include +#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/security/credentials/credentials.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static const char iam_token[] = "token"; static const char iam_selector[] = "selector"; diff --git a/test/core/end2end/tests/call_host_override.cc b/test/core/end2end/tests/call_host_override.cc index eecb98adec5..c57e81d7a0c 100644 --- a/test/core/end2end/tests/call_host_override.cc +++ b/test/core/end2end/tests/call_host_override.cc @@ -16,19 +16,20 @@ * */ -#include +#include #include -#include #include +#include +#include +#include #include #include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_accept.cc b/test/core/end2end/tests/cancel_after_accept.cc index dd99c025e4a..8d1f502e3b0 100644 --- a/test/core/end2end/tests/cancel_after_accept.cc +++ b/test/core/end2end/tests/cancel_after_accept.cc @@ -16,21 +16,24 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_client_done.cc b/test/core/end2end/tests/cancel_after_client_done.cc index 40ecb43a6b2..1e5e266f319 100644 --- a/test/core/end2end/tests/cancel_after_client_done.cc +++ b/test/core/end2end/tests/cancel_after_client_done.cc @@ -16,18 +16,21 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_invoke.cc b/test/core/end2end/tests/cancel_after_invoke.cc index 9e2a067a15c..061d28b262a 100644 --- a/test/core/end2end/tests/cancel_after_invoke.cc +++ b/test/core/end2end/tests/cancel_after_invoke.cc @@ -21,14 +21,17 @@ #include #include -#include +#include +#include +#include +#include #include -#include #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_after_round_trip.cc b/test/core/end2end/tests/cancel_after_round_trip.cc index f965aa8ad03..0f24c13e44e 100644 --- a/test/core/end2end/tests/cancel_after_round_trip.cc +++ b/test/core/end2end/tests/cancel_after_round_trip.cc @@ -16,21 +16,24 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_before_invoke.cc b/test/core/end2end/tests/cancel_before_invoke.cc index 7694385f36f..a3eec56ad4d 100644 --- a/test/core/end2end/tests/cancel_before_invoke.cc +++ b/test/core/end2end/tests/cancel_before_invoke.cc @@ -21,12 +21,15 @@ #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.cc b/test/core/end2end/tests/cancel_in_a_vacuum.cc index 820701ac71d..8c1359dd923 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.cc +++ b/test/core/end2end/tests/cancel_in_a_vacuum.cc @@ -16,18 +16,17 @@ * */ -#include -#include +#include -#include -#include +#include +#include +#include #include -#include #include "src/core/lib/gpr/useful.h" -#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/cancel_test_helpers.h b/test/core/end2end/tests/cancel_test_helpers.h index 9c744d57a7f..4616e17b7ac 100644 --- a/test/core/end2end/tests/cancel_test_helpers.h +++ b/test/core/end2end/tests/cancel_test_helpers.h @@ -20,6 +20,7 @@ #define GRPC_TEST_CORE_END2END_TESTS_CANCEL_TEST_HELPERS_H #include +#include typedef struct { const char* name; diff --git a/test/core/end2end/tests/cancel_with_status.cc b/test/core/end2end/tests/cancel_with_status.cc index c81acffc003..08c8741dfe0 100644 --- a/test/core/end2end/tests/cancel_with_status.cc +++ b/test/core/end2end/tests/cancel_with_status.cc @@ -20,16 +20,17 @@ #include #include -#include #include +#include +#include +#include #include #include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/channelz.cc b/test/core/end2end/tests/channelz.cc index e9a9671a6c5..03389bb0266 100644 --- a/test/core/end2end/tests/channelz.cc +++ b/test/core/end2end/tests/channelz.cc @@ -16,21 +16,25 @@ * */ -#include +#include "src/core/lib/channel/channelz.h" + #include -#include +#include + #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/channel/channelz_registry.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/channel.h" #include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/client_streaming.cc b/test/core/end2end/tests/client_streaming.cc index fa63218e38e..8e4d5054b27 100644 --- a/test/core/end2end/tests/client_streaming.cc +++ b/test/core/end2end/tests/client_streaming.cc @@ -16,16 +16,19 @@ // // -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/compressed_payload.cc b/test/core/end2end/tests/compressed_payload.cc index d7a292f1a5f..3b251918d78 100644 --- a/test/core/end2end/tests/compressed_payload.cc +++ b/test/core/end2end/tests/compressed_payload.cc @@ -16,7 +16,7 @@ * */ -#include +#include #include #include @@ -24,18 +24,21 @@ #include "absl/strings/str_format.h" #include -#include #include -#include +#include +#include +#include +#include #include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/gpr/useful.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/call_test_only.h" #include "test/core/compression/args_utils.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 4fb44119232..9d5655017bd 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -16,6 +16,9 @@ * */ +#include + +#include #include #include #include @@ -23,6 +26,7 @@ #include "src/core/lib/gprpp/thd.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/default_host.cc b/test/core/end2end/tests/default_host.cc index 7e2944470a3..212a8e11102 100644 --- a/test/core/end2end/tests/default_host.cc +++ b/test/core/end2end/tests/default_host.cc @@ -16,18 +16,19 @@ * */ -#include +#include #include -#include #include +#include +#include +#include #include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/disappearing_server.cc b/test/core/end2end/tests/disappearing_server.cc index 9156ade4aec..a1b7d039e0d 100644 --- a/test/core/end2end/tests/disappearing_server.cc +++ b/test/core/end2end/tests/disappearing_server.cc @@ -16,16 +16,18 @@ * */ -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/empty_batch.cc b/test/core/end2end/tests/empty_batch.cc index 0d709398d34..59e0b5dca19 100644 --- a/test/core/end2end/tests/empty_batch.cc +++ b/test/core/end2end/tests/empty_batch.cc @@ -16,18 +16,16 @@ * */ -#include -#include +#include -#include #include -#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/filter_causes_close.cc b/test/core/end2end/tests/filter_causes_close.cc index 7ad8b55a6a6..f8be4566367 100644 --- a/test/core/end2end/tests/filter_causes_close.cc +++ b/test/core/end2end/tests/filter_causes_close.cc @@ -16,21 +16,29 @@ * */ -#include -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/filter_context.cc b/test/core/end2end/tests/filter_context.cc index 312d38218b6..69fa1c0d19d 100644 --- a/test/core/end2end/tests/filter_context.cc +++ b/test/core/end2end/tests/filter_context.cc @@ -17,21 +17,33 @@ */ #include -#include -#include +#include #include +#include +#include +#include + #include -#include +#include +#include +#include +#include #include -#include +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" +#include "src/core/lib/channel/context.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_init_fails.cc b/test/core/end2end/tests/filter_init_fails.cc index 894630a2c92..2a2be4367fa 100644 --- a/test/core/end2end/tests/filter_init_fails.cc +++ b/test/core/end2end/tests/filter_init_fails.cc @@ -17,21 +17,30 @@ */ #include -#include -#include +#include #include +#include +#include + #include -#include +#include +#include +#include +#include #include -#include +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_latency.cc b/test/core/end2end/tests/filter_latency.cc index e1ade317fdc..f2f7c05070f 100644 --- a/test/core/end2end/tests/filter_latency.cc +++ b/test/core/end2end/tests/filter_latency.cc @@ -17,21 +17,32 @@ */ #include -#include -#include +#include #include +#include +#include + #include -#include +#include +#include +#include +#include #include +#include #include +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/filter_status_code.cc b/test/core/end2end/tests/filter_status_code.cc index 1f272d9047c..6ec99848d16 100644 --- a/test/core/end2end/tests/filter_status_code.cc +++ b/test/core/end2end/tests/filter_status_code.cc @@ -25,21 +25,33 @@ */ #include -#include -#include +#include #include -#include -#include +#include +#include + +#include +#include +#include +#include #include -#include +#include +#include "src/core/lib/channel/channel_fwd.h" +#include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/call.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static gpr_mu g_mu; static grpc_call_stack* g_client_call_stack; diff --git a/test/core/end2end/tests/filtered_metadata.cc b/test/core/end2end/tests/filtered_metadata.cc index 256edcad3e4..626e89e9994 100644 --- a/test/core/end2end/tests/filtered_metadata.cc +++ b/test/core/end2end/tests/filtered_metadata.cc @@ -16,16 +16,18 @@ // // -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/graceful_server_shutdown.cc b/test/core/end2end/tests/graceful_server_shutdown.cc index e4f474067ca..6657bb19771 100644 --- a/test/core/end2end/tests/graceful_server_shutdown.cc +++ b/test/core/end2end/tests/graceful_server_shutdown.cc @@ -16,16 +16,18 @@ * */ -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/grpc_authz.cc b/test/core/end2end/tests/grpc_authz.cc index 94058a55e35..404253b9f53 100644 --- a/test/core/end2end/tests/grpc_authz.cc +++ b/test/core/end2end/tests/grpc_authz.cc @@ -12,21 +12,33 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include +#include #include -#include +#include +#include +#include + +#include "absl/status/status.h" +#include "absl/strings/string_view.h" + +#include #include +#include +#include +#include #include #include +#include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/gpr/useful.h" +#include "src/core/lib/security/authorization/authorization_policy_provider.h" #include "src/core/lib/security/authorization/grpc_authorization_policy_provider.h" -#include "src/core/lib/security/credentials/credentials.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #include "test/core/util/tls_utils.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/high_initial_seqno.cc b/test/core/end2end/tests/high_initial_seqno.cc index d8591d2e67b..fc5e42a3243 100644 --- a/test/core/end2end/tests/high_initial_seqno.cc +++ b/test/core/end2end/tests/high_initial_seqno.cc @@ -16,22 +16,22 @@ * */ -#include +#include #include #include #include "absl/strings/str_cat.h" -#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/hpack_size.cc b/test/core/end2end/tests/hpack_size.cc index b4968550f2d..6bea0ecfb1a 100644 --- a/test/core/end2end/tests/hpack_size.cc +++ b/test/core/end2end/tests/hpack_size.cc @@ -16,6 +16,7 @@ * */ +#include #include #include @@ -23,16 +24,16 @@ #include "absl/strings/str_format.h" -#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/invoke_large_request.cc b/test/core/end2end/tests/invoke_large_request.cc index 00f13d8b130..97f316de6a7 100644 --- a/test/core/end2end/tests/invoke_large_request.cc +++ b/test/core/end2end/tests/invoke_large_request.cc @@ -16,7 +16,7 @@ * */ -#include +#include #include #include @@ -24,13 +24,16 @@ #include "absl/strings/str_format.h" #include -#include +#include +#include +#include +#include #include -#include #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/keepalive_timeout.cc b/test/core/end2end/tests/keepalive_timeout.cc index 1f7037386be..115440237f7 100644 --- a/test/core/end2end/tests/keepalive_timeout.cc +++ b/test/core/end2end/tests/keepalive_timeout.cc @@ -16,21 +16,25 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include #include #include "src/core/ext/transport/chttp2/transport/frame_ping.h" -#include "src/core/lib/channel/channel_args.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/iomgr/iomgr.h" +#include "src/core/lib/gprpp/global_config_generic.h" +#include "src/core/lib/gprpp/memory.h" +#include "src/core/lib/iomgr/port.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #ifdef GRPC_POSIX_SOCKET #include "src/core/lib/iomgr/ev_posix.h" diff --git a/test/core/end2end/tests/large_metadata.cc b/test/core/end2end/tests/large_metadata.cc index 3c5ff85562a..ebebddba87a 100644 --- a/test/core/end2end/tests/large_metadata.cc +++ b/test/core/end2end/tests/large_metadata.cc @@ -16,16 +16,20 @@ * */ +#include #include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/max_concurrent_streams.cc b/test/core/end2end/tests/max_concurrent_streams.cc index 650c4cc5064..f27b8ba323a 100644 --- a/test/core/end2end/tests/max_concurrent_streams.cc +++ b/test/core/end2end/tests/max_concurrent_streams.cc @@ -16,16 +16,18 @@ * */ -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/max_connection_age.cc b/test/core/end2end/tests/max_connection_age.cc index eacbf50f170..5f59bf44c6c 100644 --- a/test/core/end2end/tests/max_connection_age.cc +++ b/test/core/end2end/tests/max_connection_age.cc @@ -17,15 +17,25 @@ */ #include +#include #include +#include + +#include "absl/memory/memory.h" + +#include +#include +#include +#include #include -#include #include #include "src/core/lib/gpr/useful.h" +#include "src/core/lib/gprpp/time.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #define MAX_CONNECTION_AGE_MS 500 #define MAX_CONNECTION_AGE_GRACE_MS 1000 diff --git a/test/core/end2end/tests/max_connection_idle.cc b/test/core/end2end/tests/max_connection_idle.cc index 0b171f65926..c2b5a7ec347 100644 --- a/test/core/end2end/tests/max_connection_idle.cc +++ b/test/core/end2end/tests/max_connection_idle.cc @@ -16,17 +16,20 @@ * */ -#include +#include #include +#include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/gpr/useful.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #define MAX_CONNECTION_IDLE_MS 500 #define MAX_CONNECTION_AGE_MS 9999 diff --git a/test/core/end2end/tests/max_message_length.cc b/test/core/end2end/tests/max_message_length.cc index 678cafb0c7b..1bb748d49e9 100644 --- a/test/core/end2end/tests/max_message_length.cc +++ b/test/core/end2end/tests/max_message_length.cc @@ -16,22 +16,24 @@ * */ -#include +#include #include #include "absl/strings/match.h" #include -#include +#include +#include +#include +#include #include #include #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/slice/slice_internal.h" -#include "src/core/lib/slice/slice_string_helpers.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/negative_deadline.cc b/test/core/end2end/tests/negative_deadline.cc index 37fb0224da5..035797cd562 100644 --- a/test/core/end2end/tests/negative_deadline.cc +++ b/test/core/end2end/tests/negative_deadline.cc @@ -20,15 +20,16 @@ #include #include -#include #include -#include +#include +#include +#include #include #include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/no_error_on_hotpath.cc b/test/core/end2end/tests/no_error_on_hotpath.cc index 20ad4042021..8497c076139 100644 --- a/test/core/end2end/tests/no_error_on_hotpath.cc +++ b/test/core/end2end/tests/no_error_on_hotpath.cc @@ -16,20 +16,20 @@ * */ -#include +#include #include -#include #include +#include +#include +#include #include #include -#include -#include -#include "src/core/lib/gpr/string.h" #include "src/core/lib/iomgr/error.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/no_logging.cc b/test/core/end2end/tests/no_logging.cc index 7191fd2c8b3..bc387c7f1db 100644 --- a/test/core/end2end/tests/no_logging.cc +++ b/test/core/end2end/tests/no_logging.cc @@ -16,23 +16,25 @@ * */ -#include +#include +#include #include #include #include "absl/strings/str_cat.h" -#include #include +#include +#include +#include #include +#include #include -#include -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/iomgr/error.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" enum { TIMEOUT = 200000 }; diff --git a/test/core/end2end/tests/no_op.cc b/test/core/end2end/tests/no_op.cc index f671b5b7783..f20a92e5c61 100644 --- a/test/core/end2end/tests/no_op.cc +++ b/test/core/end2end/tests/no_op.cc @@ -16,16 +16,13 @@ * */ -#include -#include +#include -#include -#include +#include #include -#include -#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/payload.cc b/test/core/end2end/tests/payload.cc index 4021b549fa0..7af562841a5 100644 --- a/test/core/end2end/tests/payload.cc +++ b/test/core/end2end/tests/payload.cc @@ -16,16 +16,22 @@ * */ +#include #include +#include #include #include +#include +#include +#include +#include #include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/ping.cc b/test/core/end2end/tests/ping.cc index 95f1478039a..46f72aa1565 100644 --- a/test/core/end2end/tests/ping.cc +++ b/test/core/end2end/tests/ping.cc @@ -16,8 +16,10 @@ * */ +#include + +#include #include -#include #include #include "src/core/lib/channel/channel_args.h" @@ -25,6 +27,7 @@ #include "src/core/lib/surface/channel.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" #define PING_NUM 5 diff --git a/test/core/end2end/tests/ping_pong_streaming.cc b/test/core/end2end/tests/ping_pong_streaming.cc index 7dd083aef5f..b91144e5e01 100644 --- a/test/core/end2end/tests/ping_pong_streaming.cc +++ b/test/core/end2end/tests/ping_pong_streaming.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/proxy_auth.cc b/test/core/end2end/tests/proxy_auth.cc index 6f263023a39..30297982ea3 100644 --- a/test/core/end2end/tests/proxy_auth.cc +++ b/test/core/end2end/tests/proxy_auth.cc @@ -16,23 +16,20 @@ * */ -/** - * This test is for checking whether proxy authentication is working with HTTP - * Connect. - */ -#include +#include #include -#include #include +#include +#include +#include #include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/fixtures/http_proxy_fixture.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/registered_call.cc b/test/core/end2end/tests/registered_call.cc index 1a4ca1963f7..ec4c3f1f202 100644 --- a/test/core/end2end/tests/registered_call.cc +++ b/test/core/end2end/tests/registered_call.cc @@ -16,18 +16,18 @@ * */ -#include +#include #include -#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/request_with_flags.cc b/test/core/end2end/tests/request_with_flags.cc index 9799992b30d..bbbe93a8004 100644 --- a/test/core/end2end/tests/request_with_flags.cc +++ b/test/core/end2end/tests/request_with_flags.cc @@ -16,18 +16,21 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "src/core/lib/gpr/useful.h" #include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/request_with_payload.cc b/test/core/end2end/tests/request_with_payload.cc index 6b603c73d00..f900eb43a58 100644 --- a/test/core/end2end/tests/request_with_payload.cc +++ b/test/core/end2end/tests/request_with_payload.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/resource_quota_server.cc b/test/core/end2end/tests/resource_quota_server.cc index 2c3a95ff1fe..6d6016e701e 100644 --- a/test/core/end2end/tests/resource_quota_server.cc +++ b/test/core/end2end/tests/resource_quota_server.cc @@ -16,16 +16,21 @@ * */ +#include #include +#include #include #include +#include +#include +#include +#include #include #include -#include -#include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry.cc b/test/core/end2end/tests/retry.cc index a724d1699bc..774e72f23fc 100644 --- a/test/core/end2end/tests/retry.cc +++ b/test/core/end2end/tests/retry.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc index c48f7ea7394..c0779b2d97b 100644 --- a/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc +++ b/test/core/end2end/tests/retry_cancel_after_first_attempt_starts.cc @@ -14,23 +14,21 @@ // limitations under the License. // -#include +#include #include #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancel_during_delay.cc b/test/core/end2end/tests/retry_cancel_during_delay.cc index 13151f0feda..e3a6183256c 100644 --- a/test/core/end2end/tests/retry_cancel_during_delay.cc +++ b/test/core/end2end/tests/retry_cancel_during_delay.cc @@ -14,28 +14,33 @@ // limitations under the License. // -#include +#include #include #include #include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "absl/strings/string_view.h" +#include "absl/time/time.h" #include #include +#include +#include +#include #include #include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" #include "src/core/lib/gprpp/time_util.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc index b1849c27ff9..f5823eae5b3 100644 --- a/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc +++ b/test/core/end2end/tests/retry_cancel_with_multiple_send_batches.cc @@ -16,29 +16,40 @@ * */ -#include +#include #include +#include +#include + +#include "absl/strings/str_cat.h" #include "absl/strings/str_format.h" +#include "absl/types/optional.h" #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_cancellation.cc b/test/core/end2end/tests/retry_cancellation.cc index 47b20c3a151..715e90021e6 100644 --- a/test/core/end2end/tests/retry_cancellation.cc +++ b/test/core/end2end/tests/retry_cancellation.cc @@ -16,7 +16,7 @@ * */ -#include +#include #include #include @@ -25,17 +25,18 @@ #include #include +#include +#include +#include #include #include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" #include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_disabled.cc b/test/core/end2end/tests/retry_disabled.cc index 72c5365afcc..3b6bf016c21 100644 --- a/test/core/end2end/tests/retry_disabled.cc +++ b/test/core/end2end/tests/retry_disabled.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc index 575d83eafe1..efff89cdcff 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_delay.cc @@ -14,23 +14,23 @@ // limitations under the License. // +#include #include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc index 896f41a5f67..ae1deb5f5bf 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_initial_batch.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc index 920687c9039..d93206d5ff3 100644 --- a/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc +++ b/test/core/end2end/tests/retry_exceeds_buffer_size_in_subsequent_batch.cc @@ -16,23 +16,23 @@ * */ +#include #include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_lb_drop.cc b/test/core/end2end/tests/retry_lb_drop.cc index 7212f251810..b30c6242402 100644 --- a/test/core/end2end/tests/retry_lb_drop.cc +++ b/test/core/end2end/tests/retry_lb_drop.cc @@ -14,24 +14,36 @@ // limitations under the License. // -#include +#include #include +#include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" + #include #include -#include +#include +#include +#include #include -#include -#include +#include "src/core/ext/filters/client_channel/lb_policy.h" +#include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/json/json.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" #include "test/core/util/test_lb_policies.h" namespace grpc_core { diff --git a/test/core/end2end/tests/retry_lb_fail.cc b/test/core/end2end/tests/retry_lb_fail.cc index 2e33317c2a0..dea7b6d3584 100644 --- a/test/core/end2end/tests/retry_lb_fail.cc +++ b/test/core/end2end/tests/retry_lb_fail.cc @@ -14,25 +14,35 @@ // limitations under the License. // -#include +#include #include +#include +#include +#include + +#include "absl/memory/memory.h" +#include "absl/status/status.h" + #include #include -#include +#include +#include +#include #include -#include -#include +#include "src/core/ext/filters/client_channel/lb_policy.h" +#include "src/core/ext/filters/client_channel/lb_policy_factory.h" #include "src/core/ext/filters/client_channel/lb_policy_registry.h" #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/gprpp/orphanable.h" +#include "src/core/lib/gprpp/ref_counted_ptr.h" +#include "src/core/lib/iomgr/error.h" +#include "src/core/lib/json/json.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" namespace grpc_core { namespace { diff --git a/test/core/end2end/tests/retry_non_retriable_status.cc b/test/core/end2end/tests/retry_non_retriable_status.cc index 89ea355f9e5..e6a5994d181 100644 --- a/test/core/end2end/tests/retry_non_retriable_status.cc +++ b/test/core/end2end/tests/retry_non_retriable_status.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc b/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc index 2be1e184f04..34ad14ee2c2 100644 --- a/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc +++ b/test/core/end2end/tests/retry_non_retriable_status_before_recv_trailing_metadata_started.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc index 9cb432711ba..11a6781af2d 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout.cc @@ -14,25 +14,26 @@ // limitations under the License. // -#include +#include #include +#include + #include "absl/strings/str_format.h" #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc index 357a3995c21..35140671767 100644 --- a/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc +++ b/test/core/end2end/tests/retry_per_attempt_recv_timeout_on_last_attempt.cc @@ -14,25 +14,25 @@ // limitations under the License. // -#include +#include #include +#include + #include "absl/strings/str_format.h" #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_initial_metadata.cc b/test/core/end2end/tests/retry_recv_initial_metadata.cc index 47b87bdd1b4..f25cb68163d 100644 --- a/test/core/end2end/tests/retry_recv_initial_metadata.cc +++ b/test/core/end2end/tests/retry_recv_initial_metadata.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_message.cc b/test/core/end2end/tests/retry_recv_message.cc index e7371272687..293f706c07f 100644 --- a/test/core/end2end/tests/retry_recv_message.cc +++ b/test/core/end2end/tests/retry_recv_message.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_message_replay.cc b/test/core/end2end/tests/retry_recv_message_replay.cc index 09d274b2c5b..088ece1118a 100644 --- a/test/core/end2end/tests/retry_recv_message_replay.cc +++ b/test/core/end2end/tests/retry_recv_message_replay.cc @@ -16,27 +16,36 @@ * */ -#include +#include #include +#include + +#include "absl/types/optional.h" + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc index eff5ecf0b78..4ab79004b29 100644 --- a/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc +++ b/test/core/end2end/tests/retry_recv_trailing_metadata_error.cc @@ -14,27 +14,36 @@ // limitations under the License. // -#include +#include #include +#include + +#include "absl/types/optional.h" + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/gprpp/debug_location.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc index 5e805936de2..1237b49c639 100644 --- a/test/core/end2end/tests/retry_send_initial_metadata_refs.cc +++ b/test/core/end2end/tests/retry_send_initial_metadata_refs.cc @@ -16,23 +16,24 @@ * */ -#include +#include #include +#include + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index 1da7462c61a..75bae482766 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -16,27 +16,36 @@ * */ -#include +#include #include +#include + +#include "absl/types/optional.h" + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_send_recv_batch.cc b/test/core/end2end/tests/retry_send_recv_batch.cc index f151dfa89e6..1b99a71e2cb 100644 --- a/test/core/end2end/tests/retry_send_recv_batch.cc +++ b/test/core/end2end/tests/retry_send_recv_batch.cc @@ -14,23 +14,21 @@ // limitations under the License. // -#include +#include #include #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_server_pushback_delay.cc b/test/core/end2end/tests/retry_server_pushback_delay.cc index 212d590c729..85f74283136 100644 --- a/test/core/end2end/tests/retry_server_pushback_delay.cc +++ b/test/core/end2end/tests/retry_server_pushback_delay.cc @@ -16,23 +16,28 @@ * */ -#include +#include #include +#include + +#include "absl/strings/string_view.h" + #include #include +#include +#include +#include #include #include -#include #include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/slice/slice_internal.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_server_pushback_disabled.cc b/test/core/end2end/tests/retry_server_pushback_disabled.cc index 54f74f2ac96..f6377acf1c8 100644 --- a/test/core/end2end/tests/retry_server_pushback_disabled.cc +++ b/test/core/end2end/tests/retry_server_pushback_disabled.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming.cc b/test/core/end2end/tests/retry_streaming.cc index ca3280fc47b..c20c2efd67a 100644 --- a/test/core/end2end/tests/retry_streaming.cc +++ b/test/core/end2end/tests/retry_streaming.cc @@ -16,25 +16,26 @@ * */ -#include +#include #include +#include + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/channel/channelz.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "src/core/lib/surface/channel.h" -#include "src/core/lib/surface/server.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming_after_commit.cc b/test/core/end2end/tests/retry_streaming_after_commit.cc index ea2f4759c9c..2349231f40b 100644 --- a/test/core/end2end/tests/retry_streaming_after_commit.cc +++ b/test/core/end2end/tests/retry_streaming_after_commit.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc index 7cf2906dc28..679df4cc37e 100644 --- a/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc +++ b/test/core/end2end/tests/retry_streaming_succeeds_before_replay_finished.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_throttled.cc b/test/core/end2end/tests/retry_throttled.cc index d69e031ce3f..d11dae0cc4d 100644 --- a/test/core/end2end/tests/retry_throttled.cc +++ b/test/core/end2end/tests/retry_throttled.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_too_many_attempts.cc b/test/core/end2end/tests/retry_too_many_attempts.cc index 4e25c7c7be8..a3ad24a71f2 100644 --- a/test/core/end2end/tests/retry_too_many_attempts.cc +++ b/test/core/end2end/tests/retry_too_many_attempts.cc @@ -16,23 +16,22 @@ * */ -#include +#include #include #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_transparent_goaway.cc b/test/core/end2end/tests/retry_transparent_goaway.cc index 8da997b37c9..d253e684232 100644 --- a/test/core/end2end/tests/retry_transparent_goaway.cc +++ b/test/core/end2end/tests/retry_transparent_goaway.cc @@ -14,28 +14,36 @@ // limitations under the License. // -#include +#include #include +#include + +#include "absl/types/optional.h" + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" -#include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc index ad96d4adc1a..8f9daed6df1 100644 --- a/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc +++ b/test/core/end2end/tests/retry_transparent_max_concurrent_streams.cc @@ -14,28 +14,20 @@ // limitations under the License. // -#include +#include #include #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/channel/channel_stack.h" -#include "src/core/lib/channel/channel_stack_builder.h" -#include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" -#include "src/core/lib/surface/channel_init.h" -#include "src/core/lib/transport/error_utils.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc index f16d2ff70e9..3f2b9a3d4eb 100644 --- a/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc +++ b/test/core/end2end/tests/retry_transparent_not_sent_on_wire.cc @@ -14,28 +14,36 @@ // limitations under the License. // -#include +#include #include +#include + +#include "absl/types/optional.h" + #include #include +#include +#include +#include #include #include -#include -#include #include "src/core/lib/channel/channel_args.h" +#include "src/core/lib/channel/channel_fwd.h" #include "src/core/lib/channel/channel_stack.h" #include "src/core/lib/channel/channel_stack_builder.h" #include "src/core/lib/config/core_configuration.h" -#include "src/core/lib/gpr/string.h" -#include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" +#include "src/core/lib/iomgr/call_combiner.h" +#include "src/core/lib/iomgr/closure.h" +#include "src/core/lib/iomgr/error.h" #include "src/core/lib/surface/channel_init.h" -#include "src/core/lib/transport/error_utils.h" +#include "src/core/lib/surface/channel_stack_type.h" +#include "src/core/lib/transport/metadata_batch.h" +#include "src/core/lib/transport/transport.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_unref_before_finish.cc b/test/core/end2end/tests/retry_unref_before_finish.cc index fa115694423..921b376e967 100644 --- a/test/core/end2end/tests/retry_unref_before_finish.cc +++ b/test/core/end2end/tests/retry_unref_before_finish.cc @@ -14,23 +14,21 @@ // limitations under the License. // -#include +#include #include #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/retry_unref_before_recv.cc b/test/core/end2end/tests/retry_unref_before_recv.cc index 38940a76d53..cab410ff0fe 100644 --- a/test/core/end2end/tests/retry_unref_before_recv.cc +++ b/test/core/end2end/tests/retry_unref_before_recv.cc @@ -14,23 +14,21 @@ // limitations under the License. // -#include +#include #include #include #include -#include +#include +#include +#include #include -#include -#include #include "src/core/lib/channel/channel_args.h" -#include "src/core/lib/gpr/string.h" #include "src/core/lib/gpr/useful.h" -#include "src/core/lib/iomgr/exec_ctx.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" -#include "test/core/end2end/tests/cancel_test_helpers.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/server_finishes_request.cc b/test/core/end2end/tests/server_finishes_request.cc index 497db8aaa5f..765ef8a1cf6 100644 --- a/test/core/end2end/tests/server_finishes_request.cc +++ b/test/core/end2end/tests/server_finishes_request.cc @@ -16,18 +16,18 @@ * */ -#include +#include #include -#include #include -#include +#include +#include +#include #include -#include -#include "src/core/lib/gpr/string.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/server_streaming.cc b/test/core/end2end/tests/server_streaming.cc index b335a30cb9e..4908d4ccbe7 100644 --- a/test/core/end2end/tests/server_streaming.cc +++ b/test/core/end2end/tests/server_streaming.cc @@ -16,16 +16,23 @@ * */ -#include +#include #include +#include + +#include "absl/memory/memory.h" + #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/shutdown_finishes_calls.cc b/test/core/end2end/tests/shutdown_finishes_calls.cc index edf1c2e4a3a..8f63ecc2d30 100644 --- a/test/core/end2end/tests/shutdown_finishes_calls.cc +++ b/test/core/end2end/tests/shutdown_finishes_calls.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include -#include -#include +#include +#include +#include +#include #include #include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/shutdown_finishes_tags.cc b/test/core/end2end/tests/shutdown_finishes_tags.cc index 35d07bb7fa4..8555917200e 100644 --- a/test/core/end2end/tests/shutdown_finishes_tags.cc +++ b/test/core/end2end/tests/shutdown_finishes_tags.cc @@ -16,16 +16,14 @@ * */ -#include -#include +#include -#include -#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_delayed_request.cc b/test/core/end2end/tests/simple_delayed_request.cc index 23d7982dab3..2ea6832b746 100644 --- a/test/core/end2end/tests/simple_delayed_request.cc +++ b/test/core/end2end/tests/simple_delayed_request.cc @@ -16,16 +16,18 @@ * */ -#include +#include #include -#include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_metadata.cc b/test/core/end2end/tests/simple_metadata.cc index b23d8fd2d71..e2adfea7366 100644 --- a/test/core/end2end/tests/simple_metadata.cc +++ b/test/core/end2end/tests/simple_metadata.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/simple_request.cc b/test/core/end2end/tests/simple_request.cc index 9f3e1430bb2..26f94c3aeb8 100644 --- a/test/core/end2end/tests/simple_request.cc +++ b/test/core/end2end/tests/simple_request.cc @@ -16,21 +16,24 @@ * */ -#include +#include #include #include -#include #include +#include +#include +#include #include +#include #include -#include #include "src/core/lib/debug/stats.h" -#include "src/core/lib/gpr/string.h" +#include "src/core/lib/debug/stats_data.h" #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/streaming_error_response.cc b/test/core/end2end/tests/streaming_error_response.cc index 2faaf6c944e..e69a7c1f995 100644 --- a/test/core/end2end/tests/streaming_error_response.cc +++ b/test/core/end2end/tests/streaming_error_response.cc @@ -19,16 +19,19 @@ /** \file Verify that status ordering rules are obeyed. \ref doc/status_ordering.md */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/trailing_metadata.cc b/test/core/end2end/tests/trailing_metadata.cc index f8384b1a282..2782be5eb5e 100644 --- a/test/core/end2end/tests/trailing_metadata.cc +++ b/test/core/end2end/tests/trailing_metadata.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/write_buffering.cc b/test/core/end2end/tests/write_buffering.cc index b15d550ce1b..201ab2e2918 100644 --- a/test/core/end2end/tests/write_buffering.cc +++ b/test/core/end2end/tests/write_buffering.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/test/core/end2end/tests/write_buffering_at_end.cc b/test/core/end2end/tests/write_buffering_at_end.cc index 7ebe8718bb3..09406a32d26 100644 --- a/test/core/end2end/tests/write_buffering_at_end.cc +++ b/test/core/end2end/tests/write_buffering_at_end.cc @@ -16,16 +16,19 @@ * */ -#include +#include #include #include -#include +#include +#include +#include +#include #include -#include #include "test/core/end2end/cq_verifier.h" #include "test/core/end2end/end2end_tests.h" +#include "test/core/util/test_config.h" static void* tag(intptr_t t) { return reinterpret_cast(t); } diff --git a/tools/dockerfile/grpc_iwyu/iwyu.sh b/tools/dockerfile/grpc_iwyu/iwyu.sh index 73d7db7ff58..3c5d8fb8446 100755 --- a/tools/dockerfile/grpc_iwyu/iwyu.sh +++ b/tools/dockerfile/grpc_iwyu/iwyu.sh @@ -46,6 +46,7 @@ export ENABLED_MODULES=' src/core/ext src/core/lib src/cpp + test/core/end2end test/core/promise test/core/resource_quota test/core/uri @@ -67,6 +68,7 @@ cat compile_commands.json | jq -r '.[].file' | grep -v -E "/upb-generated/|/upbdefs-generated/" \ | grep -v -E $EXCLUSION_REGEX \ | grep -v src/core/lib/security/credentials/tls/grpc_tls_credentials_options.h \ + | grep -v test/core/end2end/end2end_tests.cc \ | sort \ > iwyu_files0.txt