diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:40:19 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:40:19 -0700 |
| commit | 5532ae2c53b30f5ffab20b4fa3c7d15b6c4b9591 (patch) | |
| tree | 1345449ca4f7f10a0d38cfaab1cc88e33cde88d2 /test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c | |
| parent | 65ad0a73cb4c2f144b86eca509ce7b2de576bb71 (diff) | |
| parent | b122e2ec9ff9c32b9ced1efbc02a06bc64178d9f (diff) | |
Merge branch 'churn-churn-churn-the-api-gently-down-the-stream' into we-dont-need-no-backup
Conflicts:
test/core/end2end/fixtures/chttp2_fullstack.c
test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c
test/core/end2end/fixtures/chttp2_socket_pair.c
test/core/end2end/tests/cancel_after_accept.c
Diffstat (limited to 'test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c')
| -rw-r--r-- | test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c b/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c index fd486ff6af..d14a3c3441 100644 --- a/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c +++ b/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c @@ -82,8 +82,8 @@ static void chttp2_init_server_secure_fullstack( if (f->server) { grpc_server_destroy(f->server); } - f->server = - grpc_server_create(f->server_cq, server_args); + f->server = grpc_server_create(server_args); + grpc_server_register_completion_queue(f->server, f->server_cq); GPR_ASSERT(grpc_server_add_secure_http2_port(f->server, ffd->localaddr, server_creds)); grpc_server_credentials_release(server_creds); grpc_server_start(f->server); |