X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftest%2Frun-expiry.c;h=39b5b5eafd5b00d06cc81bca395b46853fa64cd0;hb=61f58ff94e35c9b8ac5488554e2554bc5c9888b3;hp=e53de6a95311ed78c5374261c0a5afade4e12f7b;hpb=606cca7b0ed5236d1df1c4436ca79db6e3fd5321;p=ccan

diff --git a/ccan/timer/test/run-expiry.c b/ccan/timer/test/run-expiry.c
index e53de6a9..39b5b5ea 100644
--- a/ccan/timer/test/run-expiry.c
+++ b/ccan/timer/test/run-expiry.c
@@ -7,22 +7,20 @@ 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);
 
 	timers_init(&timers, grains_to_time(1364984760903400ULL));
 	ok1(timers.base == 1364984760903400ULL);
-	timer_add(&timers, &t, grains_to_time(1364984761003398ULL));
+	timer_init(&t);
+	timer_addmono(&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);