From 4b89cc6bafba2ea5b40b681bf9a9d56a86795078 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Fri, 17 May 2013 16:22:32 +0800 Subject: [PATCH] Adjust hooks test timing We unit test to be as less time sensitive as possible. This change adjusts the timing in the test to ensure we have enough time for context switching. Otherwise we get false negative sometimes. BUG=chrome-os-partner:19236 TEST=Repeatedly run the test and see it passes. BRANCH=None Change-Id: I90c1200641cb02f95bd7631bd2870ad21b21bffc Signed-off-by: Vic Yang Reviewed-on: https://gerrit.chromium.org/gerrit/51562 Reviewed-by: Vincent Palatin Reviewed-by: Randall Spangler --- test/hooks.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/test/hooks.c b/test/hooks.c index fb7944cff1..26b02d511f 100644 --- a/test/hooks.c +++ b/test/hooks.c @@ -67,7 +67,12 @@ static int test_ticks(void) uint64_t interval; int error_pct; - usleep(1500 * MSEC); + /* + * HOOK_SECOND must have been fired at least once when HOOK + * task starts. We only need to wait for just more than a second + * to allow it fires for the second time. + */ + usleep(1300 * MSEC); interval = tick_time[1].val - tick_time[0].val; error_pct = (interval - HOOK_TICK_INTERVAL) * 100 / @@ -93,22 +98,22 @@ static int test_priority(void) static int test_deferred(void) { deferred_call_count = 0; - hook_call_deferred(deferred_func, 10 * MSEC); - usleep(20 * MSEC); + hook_call_deferred(deferred_func, 50 * MSEC); + usleep(100 * MSEC); TEST_ASSERT(deferred_call_count == 1); - hook_call_deferred(deferred_func, 10 * MSEC); - usleep(5 * MSEC); + hook_call_deferred(deferred_func, 50 * MSEC); + usleep(25 * MSEC); + hook_call_deferred(deferred_func, -1); + usleep(75 * MSEC); + TEST_ASSERT(deferred_call_count == 1); + + hook_call_deferred(deferred_func, 50 * MSEC); + usleep(25 * MSEC); hook_call_deferred(deferred_func, -1); usleep(15 * MSEC); - TEST_ASSERT(deferred_call_count == 1); - - hook_call_deferred(deferred_func, 10 * MSEC); - usleep(5 * MSEC); - hook_call_deferred(deferred_func, -1); - usleep(3 * MSEC); - hook_call_deferred(deferred_func, 5 * MSEC); - usleep(10 * MSEC); + hook_call_deferred(deferred_func, 25 * MSEC); + usleep(50 * MSEC); TEST_ASSERT(deferred_call_count == 2); return EC_SUCCESS;