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.
This commit is contained in:
Yabin Cui 2015-08-11 19:05:43 +00:00 committed by Android Git Automerger
commit 0660be899f

View file

@ -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());