diff options
Diffstat (limited to 'test/core/end2end/tests/retry_send_op_fails.cc')
| -rw-r--r-- | test/core/end2end/tests/retry_send_op_fails.cc | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/test/core/end2end/tests/retry_send_op_fails.cc b/test/core/end2end/tests/retry_send_op_fails.cc index cc45fe051a..2fdc381869 100644 --- a/test/core/end2end/tests/retry_send_op_fails.cc +++ b/test/core/end2end/tests/retry_send_op_fails.cc @@ -16,6 +16,7 @@ // // +#include <memory> #include <new> #include "absl/status/status.h" @@ -28,7 +29,6 @@ #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/gprpp/status_helper.h" #include "src/core/lib/gprpp/time.h" @@ -110,6 +110,7 @@ class FailFirstCallFilter { grpc_channel_filter FailFirstCallFilter::kFilterVtable = { CallData::StartTransportStreamOpBatch, nullptr, + nullptr, grpc_channel_next_op, sizeof(CallData), CallData::Init, @@ -132,18 +133,11 @@ grpc_channel_filter FailFirstCallFilter::kFilterVtable = { // attempts are allowed CORE_END2END_TEST(RetryTest, RetrySendOpFails) { CoreConfiguration::RegisterBuilder([](CoreConfiguration::Builder* builder) { - builder->channel_init()->RegisterStage( - GRPC_CLIENT_SUBCHANNEL, 0, [](ChannelStackBuilder* builder) { - // Skip on proxy (which explicitly disables retries). - if (!builder->channel_args() - .GetBool(GRPC_ARG_ENABLE_RETRIES) - .value_or(true)) { - return true; - } - // Install filter. - builder->PrependFilter(&FailFirstCallFilter::kFilterVtable); - return true; - }); + builder->channel_init() + ->RegisterFilter(GRPC_CLIENT_SUBCHANNEL, + &FailFirstCallFilter::kFilterVtable) + // Skip on proxy (which explicitly disables retries). + .IfChannelArg(GRPC_ARG_ENABLE_RETRIES, true); }); InitServer(ChannelArgs()); InitClient(ChannelArgs().Set( |