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/cpp/end2end/end2end_test.cc | |
| parent | fc38142db69cd8c95f3c55a296b4e73b04c720c3 (diff) | |
| parent | b0bad8f3864dc9c8745736fe68efe513b2b84932 (diff) | |
Merge commit 'b0bad8f' into fix-stream-compression-config-interface
Diffstat (limited to 'test/cpp/end2end/end2end_test.cc')
| -rw-r--r-- | test/cpp/end2end/end2end_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/end2end/end2end_test.cc b/test/cpp/end2end/end2end_test.cc index b5be6fa9f2..35441580a4 100644 --- a/test/cpp/end2end/end2end_test.cc +++ b/test/cpp/end2end/end2end_test.cc @@ -711,7 +711,7 @@ TEST_P(End2endTest, ReconnectChannel) { // It needs 2 pollset_works to reconnect the channel with polling engine // "poll" char* s = gpr_getenv("GRPC_POLL_STRATEGY"); - if (s != NULL && 0 == strcmp(s, "poll")) { + if (s != nullptr && 0 == strcmp(s, "poll")) { poller_slowdown_factor = 2; } gpr_free(s); @@ -1148,7 +1148,7 @@ TEST_P(End2endTest, ChannelState) { CompletionQueue cq; std::chrono::system_clock::time_point deadline = std::chrono::system_clock::now() + std::chrono::milliseconds(10); - channel_->NotifyOnStateChange(GRPC_CHANNEL_IDLE, deadline, &cq, NULL); + channel_->NotifyOnStateChange(GRPC_CHANNEL_IDLE, deadline, &cq, nullptr); void* tag; bool ok = true; cq.Next(&tag, &ok); |