diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 22:29:04 -0800 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-02-17 22:29:04 -0800 |
| commit | 7bd5ab10552cb12302aa563c2226bfb2eee1da3f (patch) | |
| tree | cfb952b2fec4701027a5edc1d5a0b41938056757 /test/core/end2end | |
| parent | 1ece67cba24c9872ae8fbd2218c57bac8ff9794d (diff) | |
| parent | 52342b39501b0c9afbd68c25697d7af6118d7f9d (diff) | |
Merge github.com:grpc/grpc into c++api
Conflicts:
src/core/surface/server.c
Diffstat (limited to 'test/core/end2end')
| -rw-r--r-- | test/core/end2end/tests/early_server_shutdown_finishes_tags.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/core/end2end/tests/early_server_shutdown_finishes_tags.c b/test/core/end2end/tests/early_server_shutdown_finishes_tags.c index 123c8bc415..51486cc169 100644 --- a/test/core/end2end/tests/early_server_shutdown_finishes_tags.c +++ b/test/core/end2end/tests/early_server_shutdown_finishes_tags.c @@ -79,7 +79,7 @@ static void drain_cq(grpc_completion_queue *cq) { static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; - grpc_server_shutdown(f->server); + /* don't shutdown, just destroy, to tickle this code edge */ grpc_server_destroy(f->server); f->server = NULL; } |