diff options
| author |  Muxi Yan <mxyan@google.com> | 2016-11-07 10:25:55 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2016-11-07 10:25:55 -0800 |
| commit | 4be8afc7edacc5b4501c83997d22432dd1ecbc91 (patch) | |
| tree | 8c083279d83366a884e936b652a81166915f44de /test/core/end2end/fixtures/h2_full+trace.c | |
| parent | 5ebd327cf59cafdf129e33d5885cf31cc75ac737 (diff) | |
| parent | b32149461a3e04ae41fee5b414587253582aa435 (diff) | |
Merge remote-tracking branch 'upstream/master' into core-end2end-tests-cronet-update
Diffstat (limited to 'test/core/end2end/fixtures/h2_full+trace.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_full+trace.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/core/end2end/fixtures/h2_full+trace.c b/test/core/end2end/fixtures/h2_full+trace.c index 4307369f45..11a102a576 100644 --- a/test/core/end2end/fixtures/h2_full+trace.c +++ b/test/core/end2end/fixtures/h2_full+trace.c @@ -76,9 +76,7 @@ static grpc_end2end_test_fixture chttp2_create_fixture_fullstack( } void chttp2_init_client_fullstack(grpc_end2end_test_fixture *f, - grpc_channel_args *client_args, - const char *query_args) { - GPR_ASSERT(query_args == NULL); + grpc_channel_args *client_args) { fullstack_fixture_data *ffd = f->fixture_data; f->client = grpc_insecure_channel_create(ffd->localaddr, client_args, NULL); GPR_ASSERT(f->client); @@ -105,6 +103,7 @@ void chttp2_tear_down_fullstack(grpc_end2end_test_fixture *f) { /* All test configurations */ static grpc_end2end_test_config configs[] = { {"chttp2/fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | + FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER, chttp2_create_fixture_fullstack, chttp2_init_client_fullstack, chttp2_init_server_fullstack, chttp2_tear_down_fullstack}, |