X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftest%2Frun-expiry.c;h=d2969d25d95b21de5da9b0605cf8361644b5f84f;hb=fe6bc8c530795a6c718f7e8fd1a6643d9f3024a1;hp=e53de6a95311ed78c5374261c0a5afade4e12f7b;hpb=2ecae4f3ae8880196794704029c90d0285c8cb80;p=ccan diff --git a/ccan/timer/test/run-expiry.c b/ccan/timer/test/run-expiry.c index e53de6a9..d2969d25 100644 --- a/ccan/timer/test/run-expiry.c +++ b/ccan/timer/test/run-expiry.c @@ -7,7 +7,6 @@ int main(void) { struct timers timers; struct timer t; - struct list_head list; /* This is how many tests you plan to run */ plan_tests(7); @@ -17,12 +16,10 @@ int main(void) timer_add(&timers, &t, grains_to_time(1364984761003398ULL)); ok1(t.time == 1364984761003398ULL); ok1(timers.first == 1364984761003398ULL); - timers_expire(&timers, grains_to_time(1364984760903444ULL), &list); + ok1(!timers_expire(&timers, grains_to_time(1364984760903444ULL))); ok1(timers_check(&timers, NULL)); - ok1(list_pop(&list, struct timer, list) == NULL); - timers_expire(&timers, grains_to_time(1364984761002667ULL), &list); + ok1(!timers_expire(&timers, grains_to_time(1364984761002667ULL))); ok1(timers_check(&timers, NULL)); - ok1(list_pop(&list, struct timer, list) == NULL); timers_cleanup(&timers);