diff options
| author |  Craig Tiller <ctiller@google.com> | 2016-11-08 08:46:46 -0800 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2016-11-08 08:46:46 -0800 |
| commit | eba86e18531c653d47b10645bd77ae4930bce563 (patch) | |
| tree | ed3045218d4563257742f13e6d750c7cafa92cab /test/core/end2end/fixtures/h2_ssl.c | |
| parent | 3a41bbbe9bf3da96a7aead551b43f72bd470d1c0 (diff) | |
| parent | 03a58cf3873879a4e4470a437e2c0b42c75c6a7c (diff) | |
Merge github.com:grpc/grpc into securityfuzzit
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, |