diff options
| author |  David Garcia Quintas <dgq@google.com> | 2015-08-17 14:03:50 -0700 |
|---|---|---|
| committer | David Garcia Quintas <dgq@google.com> | 2015-08-17 18:28:00 -0700 |
| commit | 935c171ee8446a7327763608d8688b644a2436a0 (patch) | |
| tree | f4646cbbf7258367a16c9f4b8a81314313cd0d5e /test/core/end2end/tests/cancel_in_a_vacuum.c | |
| parent | 864d18650e007d9080257d685fc09bfbbf3a306e (diff) | |
| parent | 2461bf675ec23f513569a14933609f09b4ff3854 (diff) | |
Merge branch 'master' of github.com:grpc/grpc into compression-interop
Diffstat (limited to 'test/core/end2end/tests/cancel_in_a_vacuum.c')
| -rw-r--r-- | test/core/end2end/tests/cancel_in_a_vacuum.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.c b/test/core/end2end/tests/cancel_in_a_vacuum.c index 7645410184..f57a44caa4 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.c +++ b/test/core/end2end/tests/cancel_in_a_vacuum.c @@ -69,7 +69,7 @@ static gpr_timespec five_seconds_time(void) { return n_seconds_time(5); } static void drain_cq(grpc_completion_queue *cq) { grpc_event ev; do { - ev = grpc_completion_queue_next(cq, five_seconds_time()); + ev = grpc_completion_queue_next(cq, five_seconds_time(), NULL); } while (ev.type != GRPC_QUEUE_SHUTDOWN); } @@ -77,7 +77,8 @@ static void shutdown_server(grpc_end2end_test_fixture *f) { if (!f->server) return; grpc_server_shutdown_and_notify(f->server, f->cq, tag(1000)); GPR_ASSERT(grpc_completion_queue_pluck(f->cq, tag(1000), - GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5)) + GRPC_TIMEOUT_SECONDS_TO_DEADLINE(5), + NULL) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); f->server = NULL; @@ -108,10 +109,10 @@ static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, cq_verifier *v_client = cq_verifier_create(f.cq); c = grpc_channel_create_call(f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, - "/foo", "foo.test.google.fr", deadline); + "/foo", "foo.test.google.fr", deadline, NULL); GPR_ASSERT(c); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); grpc_call_destroy(c); |