diff options
| author |  murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
|---|---|---|
| committer | murgatroid99 <mlumish@google.com> | 2016-12-05 12:18:41 -0800 |
| commit | f1c85b0e752ecc5894ddd766cdea162defc8b352 (patch) | |
| tree | d7c5b3d4b7ce419cea108f63b832eaf060f3b0cb /test/core/end2end/fixtures/h2_ssl.c | |
| parent | da29be5ecef07781ef2cfa743300f971df05af76 (diff) | |
| parent | 032ca47012f23aecc7c7bf7f1cc9d998145119d9 (diff) | |
Merge branch 'master' into node_electron_build
Diffstat (limited to 'test/core/end2end/fixtures/h2_ssl.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_ssl.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/core/end2end/fixtures/h2_ssl.c b/test/core/end2end/fixtures/h2_ssl.c index 63282ae081..bbd522cf30 100644 --- a/test/core/end2end/fixtures/h2_ssl.c +++ b/test/core/end2end/fixtures/h2_ssl.c @@ -109,9 +109,7 @@ void chttp2_tear_down_secure_fullstack(grpc_end2end_test_fixture *f) { } static void chttp2_init_client_simple_ssl_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 *ssl_creds = grpc_ssl_credentials_create(NULL, NULL, NULL); grpc_arg ssl_name_override = {GRPC_ARG_STRING, @@ -153,7 +151,9 @@ static void chttp2_init_server_simple_ssl_secure_fullstack( static grpc_end2end_test_config configs[] = { {"chttp2/simple_ssl_fullstack", FEATURE_MASK_SUPPORTS_DELAYED_CONNECTION | - FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS, + FEATURE_MASK_SUPPORTS_PER_CALL_CREDENTIALS | + FEATURE_MASK_SUPPORTS_CLIENT_CHANNEL | + FEATURE_MASK_SUPPORTS_AUTHORITY_HEADER, chttp2_create_fixture_secure_fullstack, chttp2_init_client_simple_ssl_secure_fullstack, chttp2_init_server_simple_ssl_secure_fullstack, |