diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-03-20 09:12:16 -0700 |
| commit | de7edf83ccef1bd95186b059d55266e45db449ba (patch) | |
| tree | 4a4a8976beec2f30b106f79f498cb07e0cbbf4d7 /test/core/end2end/fixtures/h2_uchannel.c | |
| parent | 3ab6f4dc11a4936463a5588b105aad14f5a78a40 (diff) | |
| parent | cb1c389a6c98d72e59fe10e07f4c15156abf62a1 (diff) | |
Merge github.com:grpc/grpc into backoff2
Reintroduce flakiness flag for tests: lb_policies_test is inherently flaky and I don't have time to deflake this week
Diffstat (limited to 'test/core/end2end/fixtures/h2_uchannel.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_uchannel.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_uchannel.c b/test/core/end2end/fixtures/h2_uchannel.c index 87bbd64d09..0795ef18e7 100644 --- a/test/core/end2end/fixtures/h2_uchannel.c +++ b/test/core/end2end/fixtures/h2_uchannel.c @@ -285,7 +285,7 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { micro_fullstack_fixture_data *ffd = f->fixture_data; grpc_connectivity_state conn_state; - grpc_connected_subchannel *connected; + grpc_connected_subchannel *connected_subchannel; char *ipv4_localaddr; gpr_asprintf(&ipv4_localaddr, "ipv4:%s", ffd->localaddr); @@ -302,9 +302,10 @@ static void chttp2_init_client_micro_fullstack(grpc_end2end_test_fixture *f, GPR_ASSERT(conn_state == GRPC_CHANNEL_IDLE); GPR_ASSERT(ffd->sniffed_subchannel != NULL); - connected = connect_subchannel(ffd->sniffed_subchannel); + connected_subchannel = connect_subchannel(ffd->sniffed_subchannel); f->client = grpc_client_uchannel_create(ffd->sniffed_subchannel, client_args); - grpc_client_uchannel_set_connected_subchannel(f->client, connected); + grpc_client_uchannel_set_connected_subchannel(f->client, + connected_subchannel); gpr_log(GPR_INFO, "CHANNEL WRAPPING SUBCHANNEL: %p(%p)", f->client, ffd->sniffed_subchannel); |