Merge pull request #2207 from ctiller/create-pull-request/patch-ee60468

Automated fix for refs/heads/transport-refs-10
pull/36946/head
Craig Tiller 7 months ago committed by GitHub
commit 16f50573e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 6
      test/core/security/ssl_server_fuzzer.cc
  2. 24
      test/core/transport/chttp2/ping_configuration_test.cc

@ -97,9 +97,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
auto channel_args =
grpc_core::ChannelArgs().SetObject<EventEngine>(std::move(engine));
sc->add_handshakers(channel_args, nullptr, handshake_mgr.get());
handshake_mgr->DoHandshake(
mock_endpoint_controller->TakeCEndpoint(), channel_args, deadline,
nullptr /* acceptor */, on_handshake_done, &state);
handshake_mgr->DoHandshake(mock_endpoint_controller->TakeCEndpoint(),
channel_args, deadline, nullptr /* acceptor */,
on_handshake_done, &state);
grpc_core::ExecCtx::Get()->Flush();
// If the given string happens to be part of the correct client hello, the

@ -55,8 +55,8 @@ class ConfigurationTest : public ::testing::Test {
TEST_F(ConfigurationTest, ClientKeepaliveDefaults) {
ExecCtx exec_ctx;
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/true));
EXPECT_EQ(t->keepalive_time, Duration::Infinity());
@ -72,8 +72,8 @@ TEST_F(ConfigurationTest, ClientKeepaliveExplicitArgs) {
args_ = args_.Set(GRPC_ARG_KEEPALIVE_TIMEOUT_MS, 10000);
args_ = args_.Set(GRPC_ARG_KEEPALIVE_PERMIT_WITHOUT_CALLS, true);
args_ = args_.Set(GRPC_ARG_HTTP2_MAX_PINGS_WITHOUT_DATA, 3);
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/true));
EXPECT_EQ(t->keepalive_time, Duration::Seconds(20));
@ -85,8 +85,8 @@ TEST_F(ConfigurationTest, ClientKeepaliveExplicitArgs) {
TEST_F(ConfigurationTest, ServerKeepaliveDefaults) {
ExecCtx exec_ctx;
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/false));
EXPECT_EQ(t->keepalive_time, Duration::Hours(2));
@ -109,8 +109,8 @@ TEST_F(ConfigurationTest, ServerKeepaliveExplicitArgs) {
args_ =
args_.Set(GRPC_ARG_HTTP2_MIN_RECV_PING_INTERVAL_WITHOUT_DATA_MS, 20000);
args_ = args_.Set(GRPC_ARG_HTTP2_MAX_PING_STRIKES, 0);
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/false));
EXPECT_EQ(t->keepalive_time, Duration::Seconds(20));
@ -138,8 +138,8 @@ TEST_F(ConfigurationTest, ModifyClientDefaults) {
grpc_chttp2_config_default_keepalive_args(args, /*is_client=*/true);
// Note that we are using the original args_ object for creating the transport
// which does not override the defaults.
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/true));
EXPECT_EQ(t->keepalive_time, Duration::Seconds(20));
@ -165,8 +165,8 @@ TEST_F(ConfigurationTest, ModifyServerDefaults) {
grpc_chttp2_config_default_keepalive_args(args, /*is_client=*/false);
// Note that we are using the original args_ object for creating the transport
// which does not override the defaults.
grpc_chttp2_transport* t = reinterpret_cast<grpc_chttp2_transport*>(
grpc_create_chttp2_transport(
grpc_chttp2_transport* t =
reinterpret_cast<grpc_chttp2_transport*>(grpc_create_chttp2_transport(
args_, mock_endpoint_controller_->TakeCEndpoint(),
/*is_client=*/false));
EXPECT_EQ(t->keepalive_time, Duration::Seconds(20));

Loading…
Cancel
Save