commit 0fdcdd0067af88e7deef73070d0861ceb9f53c37
author Yabin Cui <yabinc@google.com> Tue Aug 11 18:41:17 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 11 18:41:17 2015 +0000
tree aa668ecfa9218ebab90440531b846024cd6b679c
parent 0f455612d3325932a851418634a17a61307948c5
parent bf572d91b50f818a7c3e29340cccf1931939ff8b

Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 42c20d3..0971de2 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -271,8 +271,8 @@
   Counter counter(Counter::CountAndDisarmNotifyFunction);
   ASSERT_EQ(0, counter.Value());
 
-  counter.SetTime(0, 1, 1, 0);
-  usleep(500000);
+  counter.SetTime(0, 500000000, 1, 0);
+  sleep(1);
 
   // The count should just be 1 because we disarmed the timer the first time it fired.
   ASSERT_EQ(1, counter.Value());