io: update for new timer API.

[ccan] / ccan / io / test / run-01-start-finish.c

diff --git a/ccan/io/test/run-01-start-finish.c b/ccan/io/test/run-01-start-finish.c
index b5114abeafcceabe3b26d88581336e63b89ee582..eb12e9488aea2eaca1dc445fb1cff6c46bddbbfc 100644 (file)
--- a/ccan/io/test/run-01-start-finish.c
+++ b/ccan/io/test/run-01-start-finish.c
@@ -6,19 +6,32 @@
 #include <sys/wait.h>
 #include <stdio.h>
 
+#ifdef DEBUG_CONN
+#define PORT "64001"
+#else
+#define PORT "65001"
+#endif
+static int expected_fd;
+
 static void finish_ok(struct io_conn *conn, int *state)
 {
        ok1(*state == 1);
+       ok1(io_conn_fd(conn) == expected_fd);
        (*state)++;
-       io_break(state + 1, io_idle());
+       io_break(state + 1);
 }
 
-static void init_conn(int fd, int *state)
+static struct io_plan *init_conn(struct io_conn *conn, int *state)
 {
+#ifdef DEBUG_CONN
+       io_set_debug(conn, true);
+#endif
        ok1(*state == 0);
        (*state)++;
-       if (!io_new_conn(fd, io_close(NULL, NULL), finish_ok, state))
-               abort();
+       expected_fd = io_conn_fd(conn);
+       io_set_finish(conn, finish_ok, state);
+
+       return io_close(conn);
 }
 
 static int make_listen_fd(const char *port, struct addrinfo **info)
@@ -61,10 +74,10 @@ int main(void)
        int fd;
 
        /* This is how many tests you plan to run */
-       plan_tests(9);
-       fd = make_listen_fd("65001", &addrinfo);
+       plan_tests(10);
+       fd = make_listen_fd(PORT, &addrinfo);
        ok1(fd >= 0);
-       l = io_new_listener(fd, init_conn, &state);
+       l = io_new_listener(NULL, fd, init_conn, &state);
        ok1(l);
        fflush(stdout);
        if (!fork()) {
@@ -80,7 +93,7 @@ int main(void)
                exit(0);
        }
        freeaddrinfo(addrinfo);
-       ok1(io_loop() == &state + 1);
+       ok1(io_loop(NULL, NULL) == &state + 1);
        ok1(state == 2);
        io_close_listener(l);
        ok1(wait(&state));