diff options
| author |  Mark D. Roth <roth@google.com> | 2017-10-30 13:07:59 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-30 13:07:59 -0700 |
| commit | 662ec97674dd0918f4db4c21f5f47038c535a9ba (patch) | |
| tree | 2c606d9e167772eafc926f162033ef80739702c2 /test | |
| parent | 555b84506e22ecd5bc5cea0f2d3dcae3a1d8c108 (diff) | |
| parent | 0e06c41c9cefe80ec2bae8a92bc0a0e2500af800 (diff) | |
Merge pull request #12878 from markdroth/pick_first_subchannel_list
Refactor subchannel_list code out of RR and use it in PF.
Diffstat (limited to 'test')
| -rw-r--r-- | test/core/client_channel/lb_policies_test.c | 4 | ||||
| -rw-r--r-- | test/cpp/end2end/client_lb_end2end_test.cc | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/core/client_channel/lb_policies_test.c b/test/core/client_channel/lb_policies_test.c index ba37cd673f..0e47d8f324 100644 --- a/test/core/client_channel/lb_policies_test.c +++ b/test/core/client_channel/lb_policies_test.c @@ -53,8 +53,8 @@ typedef struct request_sequences { size_t n; /* number of iterations */ int *connections; /* indexed by the interation number, value is the index of the server it connected to or -1 if none */ - int *connectivity_states; /* indexed by the interation number, value is the - client connectivity state */ + /* indexed by the interation number, value is the client connectivity state */ + grpc_connectivity_state *connectivity_states; } request_sequences; typedef void (*verifier_fn)(const servers_fixture *, grpc_channel *, diff --git a/test/cpp/end2end/client_lb_end2end_test.cc b/test/cpp/end2end/client_lb_end2end_test.cc index c236f76e89..805e5b1045 100644 --- a/test/cpp/end2end/client_lb_end2end_test.cc +++ b/test/cpp/end2end/client_lb_end2end_test.cc @@ -305,7 +305,7 @@ TEST_F(ClientLbEnd2endTest, PickFirstUpdates) { ports.clear(); SetNextResolution(ports); gpr_log(GPR_INFO, "****** SET none *******"); - grpc_connectivity_state channel_state = GRPC_CHANNEL_INIT; + grpc_connectivity_state channel_state; do { channel_state = channel_->GetState(true /* try to connect */); } while (channel_state == GRPC_CHANNEL_READY); @@ -481,7 +481,7 @@ TEST_F(ClientLbEnd2endTest, RoundRobinUpdates) { // An empty update will result in the channel going into TRANSIENT_FAILURE. ports.clear(); SetNextResolution(ports); - grpc_connectivity_state channel_state = GRPC_CHANNEL_INIT; + grpc_connectivity_state channel_state; do { channel_state = channel_->GetState(true /* try to connect */); } while (channel_state == GRPC_CHANNEL_READY); |