diff options
| author | Yabin Cui <yabinc@google.com> | 2015-08-11 18:41:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-11 18:41:17 +0000 |
| commit | 0fdcdd0067af88e7deef73070d0861ceb9f53c37 (patch) | |
| tree | aa668ecfa9218ebab90440531b846024cd6b679c | |
| parent | 0f455612d3325932a851418634a17a61307948c5 (diff) | |
| parent | bf572d91b50f818a7c3e29340cccf1931939ff8b (diff) | |
| download | bionic-lollipop-mr1-cts-dev.tar.gz | |
Merge "Fix flaky test time.timer_settime_0." into lollipop-mr1-cts-devandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10lollipop-mr1-cts-releaselollipop-mr1-cts-dev
| -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 42c20d3b8..0971de248 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -271,8 +271,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()); |