diff options
| author |  Mark D. Roth <roth@google.com> | 2018-10-25 12:24:42 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-10-25 12:24:42 -0700 |
| commit | 2cff9ca40898ae034d5c547a711c5b0dacfffece (patch) | |
| tree | b41df2e35db1fc615944dadc528ae280373aea10 /test/cpp/end2end/grpclb_end2end_test.cc | |
| parent | d24af715e1827784146bf027600a2695bf5c3acf (diff) | |
Revert "Revert "Fail wait_for_ready=false RPCs when channel is in TRANSIENT_FAILURE.""
Diffstat (limited to 'test/cpp/end2end/grpclb_end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/grpclb_end2end_test.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/cpp/end2end/grpclb_end2end_test.cc b/test/cpp/end2end/grpclb_end2end_test.cc index b69b861fcf..6ce0696114 100644 --- a/test/cpp/end2end/grpclb_end2end_test.cc +++ b/test/cpp/end2end/grpclb_end2end_test.cc @@ -539,13 +539,15 @@ class GrpclbEnd2endTest : public ::testing::Test { balancers_.at(i)->add_response(response, delay_ms); } - Status SendRpc(EchoResponse* response = nullptr, int timeout_ms = 1000) { + Status SendRpc(EchoResponse* response = nullptr, int timeout_ms = 1000, + bool wait_for_ready = false) { const bool local_response = (response == nullptr); if (local_response) response = new EchoResponse; EchoRequest request; request.set_message(kRequestMessage_); ClientContext context; context.set_deadline(grpc_timeout_milliseconds_to_deadline(timeout_ms)); + if (wait_for_ready) context.set_wait_for_ready(true); Status status = stub_->Echo(&context, request, response); if (local_response) delete response; return status; @@ -1366,7 +1368,7 @@ TEST_F(SingleBalancerTest, DropAllFirst) { {}, {{"rate_limiting", num_of_drop_by_rate_limiting_addresses}, {"load_balancing", num_of_drop_by_load_balancing_addresses}}), 0); - const Status status = SendRpc(); + const Status status = SendRpc(nullptr, 1000, true); EXPECT_FALSE(status.ok()); EXPECT_EQ(status.error_message(), "Call dropped by load balancing policy"); } @@ -1391,7 +1393,7 @@ TEST_F(SingleBalancerTest, DropAll) { // fail. Status status; do { - status = SendRpc(); + status = SendRpc(nullptr, 1000, true); } while (status.ok()); EXPECT_FALSE(status.ok()); EXPECT_EQ(status.error_message(), "Call dropped by load balancing policy"); |