diff options
| author |  Muxi Yan <mxyan@google.com> | 2017-12-06 22:09:36 -0800 |
|---|---|---|
| committer | Muxi Yan <mxyan@google.com> | 2017-12-06 22:09:36 -0800 |
| commit | 67454d71e833a7704d61e673ad32e71dd31c868a (patch) | |
| tree | fe720c5bb8388a02ed334b0b0c071c0f7b895b31 /test/core/end2end/tests/connectivity.cc | |
| parent | fc38142db69cd8c95f3c55a296b4e73b04c720c3 (diff) | |
| parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) | |
Merge commit 'b0bad8f' into fix-stream-compression-config-interface
Diffstat (limited to 'test/core/end2end/tests/connectivity.cc')
| -rw-r--r-- | test/core/end2end/tests/connectivity.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/core/end2end/tests/connectivity.cc b/test/core/end2end/tests/connectivity.cc index 4f302d11dc..2ea4ca81f5 100644 --- a/test/core/end2end/tests/connectivity.cc +++ b/test/core/end2end/tests/connectivity.cc @@ -39,14 +39,14 @@ static void child_thread(void* arg) { gpr_event_set(&ce->started, (void*)1); gpr_log(GPR_DEBUG, "verifying"); ev = grpc_completion_queue_next(ce->cq, gpr_inf_future(GPR_CLOCK_MONOTONIC), - NULL); + nullptr); GPR_ASSERT(ev.type == GRPC_OP_COMPLETE); GPR_ASSERT(ev.tag == tag(1)); GPR_ASSERT(ev.success == 0); } static void test_connectivity(grpc_end2end_test_config config) { - grpc_end2end_test_fixture f = config.create_fixture(NULL, NULL); + grpc_end2end_test_fixture f = config.create_fixture(nullptr, nullptr); grpc_connectivity_state state; cq_verifier* cqv = cq_verifier_create(f.cq); child_events ce; @@ -115,7 +115,7 @@ static void test_connectivity(grpc_end2end_test_config config) { gpr_log(GPR_DEBUG, "*** STARTING SERVER ***"); /* now let's bring up a server to connect to */ - config.init_server(&f, NULL); + config.init_server(&f, nullptr); gpr_log(GPR_DEBUG, "*** STARTED SERVER ***"); |