diff options
| author |  David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2016-05-31 13:59:37 -0700 |
| commit | 8bec6f6a55afaa1e321f29bf816d2a010f510b3c (patch) | |
| tree | 525e06b564b9d23d8340e25e7ddb9915fec0b1e5 /test/core/end2end/fixtures/h2_sockpair.c | |
| parent | 582f4350ed755aac0b07f12b499ad18f86f2a1b7 (diff) | |
| parent | 0d6196025e62aea5aabc6341459f2c370e264230 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into lb_pollset_propagation
Diffstat (limited to 'test/core/end2end/fixtures/h2_sockpair.c')
| -rw-r--r-- | test/core/end2end/fixtures/h2_sockpair.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/test/core/end2end/fixtures/h2_sockpair.c b/test/core/end2end/fixtures/h2_sockpair.c index f28147cf40..7be88f8a68 100644 --- a/test/core/end2end/fixtures/h2_sockpair.c +++ b/test/core/end2end/fixtures/h2_sockpair.c @@ -49,6 +49,7 @@ #include "src/core/lib/iomgr/endpoint_pair.h" #include "src/core/lib/iomgr/iomgr.h" #include "src/core/lib/surface/channel.h" +#include "src/core/lib/surface/completion_queue.h" #include "src/core/lib/surface/server.h" #include "test/core/util/port.h" #include "test/core/util/test_config.h" @@ -59,7 +60,9 @@ static void server_setup_transport(void *ts, grpc_transport *transport) { grpc_end2end_test_fixture *f = ts; grpc_exec_ctx exec_ctx = GRPC_EXEC_CTX_INIT; - grpc_server_setup_transport(&exec_ctx, f->server, transport, + grpc_endpoint_pair *sfd = f->fixture_data; + grpc_endpoint_add_to_pollset(&exec_ctx, sfd->server, grpc_cq_pollset(f->cq)); + grpc_server_setup_transport(&exec_ctx, f->server, transport, NULL, grpc_server_get_channel_args(f->server)); grpc_exec_ctx_finish(&exec_ctx); } |