diff options
| author | Yabin Cui <yabinc@google.com> | 2015-08-11 19:05:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-11 19:05:43 +0000 |
| commit | 0660be899f2d907dedbcb643315b73e652ec9510 (patch) | |
| tree | cf655ed53f335273d71e84535a3e3f1a8812ff3e | |
| parent | de0fb393ae8136a5958fe17eee0c6285e2f7f91a (diff) | |
| parent | a6a12a7804402273e193074a58162cc0b3890812 (diff) | |
| download | bionic-0660be899f2d907dedbcb643315b73e652ec9510.zip bionic-0660be899f2d907dedbcb643315b73e652ec9510.tar.gz bionic-0660be899f2d907dedbcb643315b73e652ec9510.tar.bz2 | |
am a6a12a78: am 0fdcdd00: Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-dev
* commit 'a6a12a7804402273e193074a58162cc0b3890812':
Fix flaky test time.timer_settime_0.
| -rw-r--r-- | tests/time_test.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/time_test.cpp b/tests/time_test.cpp index 90de8d8..0ea90a8 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -296,8 +296,8 @@ TEST(time, timer_settime_0) { 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()); |