diff options
author | Craig Tiller <ctiller@google.com> | 2017-10-06 11:56:39 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-06 11:56:39 -0700 |
commit | 3640b4084ac8485ef99ab3162cae7b8b079bbf6b (patch) | |
tree | 8c949d86089640bd8449a1c011eec9b0a176f673 /test/cpp/common | |
parent | 1b11c745417dc54ccc31bba4cdfb2adb02c09ab9 (diff) | |
parent | d48bd078d7f257db2d4c48e8e835bb2ff1ac7e73 (diff) |
Merge pull request #12677 from ctiller/flowctl+millis
Roll-up: Flow control changes, and internal timing changes
Diffstat (limited to 'test/cpp/common')
-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); |