From: Marie Janssen <jamuraa@google.com>
Date: Tue, 29 Dec 2015 23:34:55 +0000 (-0800)
Subject: Fix flaky AlarmTest.test_set_long_*
X-Git-Tag: android-x86-7.1-r1~394^2~78
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac786e364a;p=android-x86%2Fsystem-bt.git

Fix flaky AlarmTest.test_set_long_*

The "long" tests need some leeway for the timer to be checked because
sometimes it takes ~1-2ms to check timers for wakelock scheduling.

Bug: 26140385
Change-Id: I362166f1d93a811f3933776294775b594226ab30
---

diff --git a/osi/test/alarm_test.cpp b/osi/test/alarm_test.cpp
index 1b4895cf3..88beaf54e 100644
--- a/osi/test/alarm_test.cpp
+++ b/osi/test/alarm_test.cpp
@@ -109,7 +109,7 @@ TEST_F(AlarmTest, test_set_short) {
 
 TEST_F(AlarmTest, test_set_long) {
   alarm_t *alarm = alarm_new();
-  alarm_set(alarm, TIMER_INTERVAL_FOR_WAKELOCK_IN_MS, cb, NULL);
+  alarm_set(alarm, TIMER_INTERVAL_FOR_WAKELOCK_IN_MS + EPSILON_MS, cb, NULL);
 
   EXPECT_EQ(cb_counter, 0);
   EXPECT_FALSE(WakeLockHeld());
@@ -180,8 +180,8 @@ TEST_F(AlarmTest, test_set_long_long) {
     alarm_new()
   };
 
-  alarm_set(alarm[0], TIMER_INTERVAL_FOR_WAKELOCK_IN_MS, cb, NULL);
-  alarm_set(alarm[1], 2 * TIMER_INTERVAL_FOR_WAKELOCK_IN_MS + EPSILON_MS, cb, NULL);
+  alarm_set(alarm[0], TIMER_INTERVAL_FOR_WAKELOCK_IN_MS + EPSILON_MS, cb, NULL);
+  alarm_set(alarm[1], 2 * (TIMER_INTERVAL_FOR_WAKELOCK_IN_MS + EPSILON_MS), cb, NULL);
 
   EXPECT_EQ(cb_counter, 0);
   EXPECT_FALSE(WakeLockHeld());