diff options
Diffstat (limited to 'test/core/end2end/tests/cancel_in_a_vacuum.cc')
-rw-r--r-- | test/core/end2end/tests/cancel_in_a_vacuum.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/core/end2end/tests/cancel_in_a_vacuum.cc b/test/core/end2end/tests/cancel_in_a_vacuum.cc index 090ee2fbb2..a6c534eb08 100644 --- a/test/core/end2end/tests/cancel_in_a_vacuum.cc +++ b/test/core/end2end/tests/cancel_in_a_vacuum.cc @@ -56,7 +56,7 @@ static gpr_timespec five_seconds_from_now(void) { static void drain_cq(grpc_completion_queue* cq) { grpc_event ev; do { - ev = grpc_completion_queue_next(cq, five_seconds_from_now(), NULL); + ev = grpc_completion_queue_next(cq, five_seconds_from_now(), nullptr); } while (ev.type != GRPC_QUEUE_SHUTDOWN); } @@ -65,16 +65,16 @@ static void shutdown_server(grpc_end2end_test_fixture* f) { grpc_server_shutdown_and_notify(f->server, f->shutdown_cq, tag(1000)); GPR_ASSERT(grpc_completion_queue_pluck(f->shutdown_cq, tag(1000), grpc_timeout_seconds_to_deadline(5), - NULL) + nullptr) .type == GRPC_OP_COMPLETE); grpc_server_destroy(f->server); - f->server = NULL; + f->server = nullptr; } static void shutdown_client(grpc_end2end_test_fixture* f) { if (!f->client) return; grpc_channel_destroy(f->client); - f->client = NULL; + f->client = nullptr; } static void end_test(grpc_end2end_test_fixture* f) { @@ -92,18 +92,18 @@ static void test_cancel_in_a_vacuum(grpc_end2end_test_config config, cancellation_mode mode) { grpc_call* c; grpc_end2end_test_fixture f = - begin_test(config, "test_cancel_in_a_vacuum", mode, NULL, NULL); + begin_test(config, "test_cancel_in_a_vacuum", mode, nullptr, nullptr); cq_verifier* v_client = cq_verifier_create(f.cq); gpr_timespec deadline = five_seconds_from_now(); c = grpc_channel_create_call( - f.client, NULL, GRPC_PROPAGATE_DEFAULTS, f.cq, + f.client, nullptr, GRPC_PROPAGATE_DEFAULTS, f.cq, grpc_slice_from_static_string("/foo"), get_host_override_slice("foo.test.google.fr:1234", config), deadline, - NULL); + nullptr); GPR_ASSERT(c); - GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, NULL)); + GPR_ASSERT(GRPC_CALL_OK == mode.initiate_cancel(c, nullptr)); grpc_call_unref(c); |