diff options
author | 2015-06-17 12:34:45 -0700 | |
---|---|---|
committer | 2015-06-17 12:34:45 -0700 | |
commit | a93954f844bdc7f8077a69a13f39131f7936f455 (patch) | |
tree | 9b589df12f217e8e2596dc2cc7711398da201cea /test/core/end2end/tests/disappearing_server.c | |
parent | 656e776ae1516ff6dbb553b2a4aef1eccdf8cb72 (diff) | |
parent | 8c95eabf109badf8a82112e401251f7064b15eff (diff) |
Merge pull request #1731 from ctiller/you-complete-me
New core shutdown API
Diffstat (limited to 'test/core/end2end/tests/disappearing_server.c')
-rw-r--r-- | test/core/end2end/tests/disappearing_server.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/core/end2end/tests/disappearing_server.c b/test/core/end2end/tests/disappearing_server.c index 62e58d8b0d..cf9b79f117 100644 --- a/test/core/end2end/tests/disappearing_server.c +++ b/test/core/end2end/tests/disappearing_server.c @@ -62,7 +62,6 @@ 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); grpc_server_destroy(f->server); f->server = NULL; } @@ -141,7 +140,7 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, /* should be able to shut down the server early - and still complete the request */ - grpc_server_shutdown(f->server); + grpc_server_shutdown_and_notify(f->server, f->server_cq, tag(1000)); op = ops; op->op = GRPC_OP_SEND_INITIAL_METADATA; @@ -161,6 +160,7 @@ static void do_request_and_shutdown_server(grpc_end2end_test_fixture *f, GPR_ASSERT(GRPC_CALL_OK == grpc_call_start_batch(s, ops, op - ops, tag(102))); cq_expect_completion(v_server, tag(102), 1); + cq_expect_completion(v_server, tag(1000), 1); cq_verify(v_server); cq_expect_completion(v_client, tag(1), 1); |