diff options
| author |  Yuchen Zeng <zyc@google.com> | 2016-10-24 13:00:10 -0700 |
|---|---|---|
| committer | Yuchen Zeng <zyc@google.com> | 2016-10-24 13:00:10 -0700 |
| commit | d30699c7bebfa3cb0ad4ba1eac99284a52b7859f (patch) | |
| tree | 32ed6c891354680361699707301273eee4c9ac54 /test/core/end2end/fixtures/h2_census.c | |
| parent | 654aa869d2817a9be127f66df8cd8b18e7b760bc (diff) | |
| parent | 13ca42dbae2656b97b3e40e0fa8b63aae7fd5dd5 (diff) | |
Merge remote-tracking branch 'upstream/master' into reflection_header
Diffstat (limited to 'test/core/end2end/fixtures/h2_census.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_census.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_census.c b/test/core/end2end/fixtures/h2_census.c index e46b39e476..c2e1acf57f 100644 --- a/test/core/end2end/fixtures/h2_census.c +++ b/test/core/end2end/fixtures/h2_census.c @@ -41,7 +41,7 @@ #include <grpc/support/sync.h> #include <grpc/support/thd.h> #include <grpc/support/useful.h> -#include "src/core/ext/client_config/client_channel.h" +#include "src/core/ext/client_channel/client_channel.h" #include "src/core/ext/transport/chttp2/transport/chttp2_transport.h" #include "src/core/lib/channel/channel_args.h" #include "src/core/lib/channel/connected_channel.h" @@ -79,13 +79,15 @@ static grpc_arg make_census_enable_arg(void) { } void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args) { + grpc_channel_args *client_args, + const char *query_args) { + GPR_ASSERT(query_args == NULL); fullstack_fixture_data *ffd = f->fixture_data; grpc_arg arg = make_census_enable_arg(); client_args = grpc_channel_args_copy_and_add(client_args, &arg, 1); f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); - grpc_channel_args_destroy(client_args); GPR_ASSERT(f->client); + grpc_channel_args_destroy(client_args); } void chttp2_init_server_fullstack(grpc_end2end_test_fixture *f, |