timer: change timers_expire() to return a single timer.

[ccan] / ccan / timer / test / run-expiry.c

diff --git a/ccan/timer/test/run-expiry.c b/ccan/timer/test/run-expiry.c
index e53de6a95311ed78c5374261c0a5afade4e12f7b..d2969d25d95b21de5da9b0605cf8361644b5f84f 100644 (file)
--- 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);