From 3da136aa47e2d1608b98abb2580f024b36f92831 Mon Sep 17 00:00:00 2001 From: Christopher Ferris Date: Wed, 18 Feb 2015 17:11:47 -0800 Subject: [PATCH] Modify test to avoid race condition. There is a possible race if a timer is set to trigger at nearly the same time as it is set. Since nobody uses the timers like this, modify the test so this doesn't happen. The race that this can provoke has been fixed in aosp. Bug: 19423618 Change-Id: I21084c99da5ae46f404936d673dae6bad7c82caa --- tests/time_test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/time_test.cpp b/tests/time_test.cpp index d637df226..9880d2cbe 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -386,11 +386,11 @@ TEST(time, timer_delete_from_timer_thread) { ASSERT_EQ(0, timer_create(CLOCK_REALTIME, &se, &tdd.timer_id)); itimerspec ts; - ts.it_value.tv_sec = 0; - ts.it_value.tv_nsec = 100; + ts.it_value.tv_sec = 1; + ts.it_value.tv_nsec = 0; ts.it_interval.tv_sec = 0; ts.it_interval.tv_nsec = 0; - ASSERT_EQ(0, timer_settime(tdd.timer_id, TIMER_ABSTIME, &ts, NULL)); + ASSERT_EQ(0, timer_settime(tdd.timer_id, 0, &ts, NULL)); time_t cur_time = time(NULL); while (!tdd.complete && (time(NULL) - cur_time) < 5);