diff options
| author |  Michael Darakananda <pongad@google.com> | 2017-10-10 15:07:28 +1100 |
|---|---|---|
| committer | Michael Darakananda <pongad@google.com> | 2017-10-10 15:07:28 +1100 |
| commit | df6e3750b24a584daa823e01b2a69ac65f59af83 (patch) | |
| tree | 659cbc6c0021d03564b516110abd4b09bd17ce82 /test/cpp/common/alarm_cpp_test.cc | |
| parent | b268629245788bee994e96cb585a3ab2c78bafa8 (diff) | |
| parent | b6142ef1a6dc70565f468346c7935f43dbcb55fa (diff) | |
Merge branch 'master' into fix-php
Diffstat (limited to 'test/cpp/common/alarm_cpp_test.cc')
| -rw-r--r-- | test/cpp/common/alarm_cpp_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cpp/common/alarm_cpp_test.cc b/test/cpp/common/alarm_cpp_test.cc index 212972d25d..7adc3102f4 100644 --- a/test/cpp/common/alarm_cpp_test.cc +++ b/test/cpp/common/alarm_cpp_test.cc @@ -142,7 +142,7 @@ TEST(AlarmTest, ZeroExpiry) { void* output_tag; bool ok; const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(0)); + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); EXPECT_EQ(status, CompletionQueue::GOT_EVENT); EXPECT_TRUE(ok); @@ -158,7 +158,7 @@ TEST(AlarmTest, NegativeExpiry) { void* output_tag; bool ok; const CompletionQueue::NextStatus status = cq.AsyncNext( - (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(0)); + (void**)&output_tag, &ok, grpc_timeout_seconds_to_deadline(1)); EXPECT_EQ(status, CompletionQueue::GOT_EVENT); EXPECT_TRUE(ok); |