tdb2: failtest on tdb_expand

[ccan] / ccan / tdb2 / test / run-01-new_database.c

diff --git a/ccan/tdb2/test/run-01-new_database.c b/ccan/tdb2/test/run-01-new_database.c
index 6b82d57657beb3b05f6bc880b4de6d6142d7af0a..2d1cfc837768e62c2546119e81c4c9c3a9da05c4 100644 (file)
--- a/ccan/tdb2/test/run-01-new_database.c
+++ b/ccan/tdb2/test/run-01-new_database.c
@@ -1,11 +1,15 @@
+#include <ccan/failtest/failtest_override.h>
 #include <ccan/tdb2/tdb.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
 #include <ccan/tdb2/hash.c>
+#include <ccan/tdb2/transaction.c>
 #include <ccan/tdb2/check.c>
 #include <ccan/tap/tap.h>
+#include <ccan/failtest/failtest.h>
 #include "logging.h"
+#include "failtest_helper.h"
 
 int main(int argc, char *argv[])
 {
@@ -15,16 +19,23 @@ int main(int argc, char *argv[])
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
                        TDB_NOMMAP|TDB_CONVERT };
 
-       plan_tests(sizeof(flags) / sizeof(flags[0]) * 2 + 1);
+       failtest_init(argc, argv);
+       failtest_hook = block_repeat_failures;
+       failtest_exit_check = exit_check_log;
+       plan_tests(sizeof(flags) / sizeof(flags[0]) * 3);
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
                tdb = tdb_open("run-new_database.tdb", flags[i],
                               O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
-               ok1(tdb);
+               if (!ok1(tdb))
+                       failtest_exit(exit_status());
                if (tdb) {
-                       ok1(tdb_check(tdb, NULL, NULL) == 0);
+                       bool ok = ok1(tdb_check(tdb, NULL, NULL) == 0);
                        tdb_close(tdb);
+                       if (!ok)
+                               failtest_exit(exit_status());
                }
+               if (!ok1(tap_log_messages == 0))
+                       break;
        }
-       ok1(tap_log_messages == 0);
-       return exit_status();
+       failtest_exit(exit_status());
 }