diff options
author | Craig Tiller <ctiller@google.com> | 2016-11-04 13:20:49 -0700 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-11-04 13:20:49 -0700 |
commit | b65e234f7af6df1625ccd4dec386e0fa2f573eb7 (patch) | |
tree | 07071573c03e526c16fbe3bfd487a2f3060503fb /test/core/end2end/fixtures/h2_fakesec.c | |
parent | 31c5ee230369b758978c5e4e87911d759a7f9184 (diff) | |
parent | 4736c55e0f923b8f3b8713449500a43ab8686ae3 (diff) |
Merge github.com:grpc/grpc into fuzzit
Diffstat (limited to 'test/core/end2end/fixtures/h2_fakesec.c')
-rw-r--r-- | test/core/end2end/fixtures/h2_fakesec.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/core/end2end/fixtures/h2_fakesec.c b/test/core/end2end/fixtures/h2_fakesec.c index dbe9011dcf..9a8739a1de 100644 --- a/test/core/end2end/fixtures/h2_fakesec.c +++ b/test/core/end2end/fixtures/h2_fakesec.c @@ -105,9 +105,7 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { } static void chttp2_init_client_fake_secure_fullstack( - grpc_end2end_test_fixture *f, grpc_channel_args *client_args, - const char *query_args) { - GPR_ASSERT(query_args == NULL); + grpc_end2end_test_fixture *f, grpc_channel_args *client_args) { grpc_channel_credentials *fake_ts_creds = grpc_fake_transport_security_credentials_create(); chttp2_init_client_secure_fullstack(f, client_args, fake_ts_creds); @@ -142,7 +140,8 @@ static void chttp2_init_server_fake_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/fake_secure_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | + FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL, chttp2_create_fixture_secure_fullstack, chttp2_init_client_fake_secure_fullstack, chttp2_init_server_fake_secure_fullstack, |