commit 98be6be171b3792c51d83d19f015052112f8ddbf
author Dimitry Ivanov <dimitry@google.com> Mon Oct 05 20:17:39 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 05 20:17:39 2015 +0000
tree 5ae6db42253cfbba27320690953be165f658e892
parent df62e3171ca52cbdadb3c3edc93c42cfacbad054
parent 748421beef0ed8625920a27b3753a79c2652b6ef

am 748421be: Merge "Fix linker tests"

* commit '748421beef0ed8625920a27b3753a79c2652b6ef':
  Fix linker tests

tests/time_test.cpp

diff --git a/tests/time_test.cpp b/tests/time_test.cpp
index 052997a..c685e94 100644
--- a/tests/time_test.cpp
+++ b/tests/time_test.cpp
@@ -296,8 +296,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());
@@ -381,8 +381,8 @@
   ASSERT_EQ(0, counter2.Value());
   ASSERT_EQ(0, counter3.Value());
 
-  counter2.SetTime(0, 1, 0, 0);
-  usleep(500000);
+  counter2.SetTime(0, 500000000, 0, 0);
+  sleep(1);
 
   EXPECT_EQ(0, counter1.Value());
   EXPECT_EQ(1, counter2.Value());