tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / test / run-11-simple-fetch.c

diff --git a/ccan/tdb2/test/run-11-simple-fetch.c b/ccan/tdb2/test/run-11-simple-fetch.c
index 7225d88d3f583eba758f4e90dfc84f4192bd84d5..278d726ad20f3e66d8da80ad8f3244ca045f91b1 100644 (file)
--- a/ccan/tdb2/test/run-11-simple-fetch.c
+++ b/ccan/tdb2/test/run-11-simple-fetch.c
@@ -1,4 +1,6 @@
+#include <ccan/failtest/failtest_override.h>
 #include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/open.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
@@ -6,7 +8,20 @@
 #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"
+
+static bool failtest_suppress = false;
+
+/* Don't need to test everything here, just want fetch testing. */
+static enum failtest_result
+suppress_failure(struct failtest_call *history, unsigned num)
+{
+       if (failtest_suppress)
+               return FAIL_DONT_FAIL;
+       return block_repeat_failures(history, num);
+}
 
 int main(int argc, char *argv[])
 {
@@ -15,32 +30,47 @@ int main(int argc, char *argv[])
        int flags[] = { TDB_INTERNAL, TDB_DEFAULT, TDB_NOMMAP,
                        TDB_INTERNAL|TDB_CONVERT, TDB_CONVERT, 
                        TDB_NOMMAP|TDB_CONVERT };
-       struct tdb_data key = { (unsigned char *)"key", 3 };
-       struct tdb_data data = { (unsigned char *)"data", 4 };
+       struct tdb_data key = tdb_mkdata("key", 3);
+       struct tdb_data data = tdb_mkdata("data", 4);
+
+       failtest_init(argc, argv);
+       failtest_hook = suppress_failure;
+       failtest_exit_check = exit_check_log;
 
+       failtest_suppress = true;
        plan_tests(sizeof(flags) / sizeof(flags[0]) * 8 + 1);
        for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
                tdb = tdb_open("run-11-simple-fetch.tdb", flags[i],
                               O_RDWR|O_CREAT|O_TRUNC, 0600, &tap_log_attr);
                ok1(tdb);
                if (tdb) {
-                       struct tdb_data d;
+                       struct tdb_data d = { NULL, 0 }; /* Bogus GCC warning */
 
                        /* fetch should fail. */
-                       d = tdb_fetch(tdb, key);
-                       ok1(d.dptr == NULL);
-                       ok1(tdb_error(tdb) == TDB_ERR_NOEXIST);
+                       failtest_suppress = false;
+                       if (!ok1(tdb_fetch(tdb, key, &d) == TDB_ERR_NOEXIST))
+                               goto fail;
+                       failtest_suppress = true;
                        ok1(tdb_check(tdb, NULL, NULL) == 0);
                        /* Insert should succeed. */
                        ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
                        ok1(tdb_check(tdb, NULL, NULL) == 0);
                        /* Fetch should now work. */
-                       d = tdb_fetch(tdb, key);
-                       ok1(data_equal(d, data));
+                       failtest_suppress = false;
+                       if (!ok1(tdb_fetch(tdb, key, &d) == TDB_SUCCESS))
+                               goto fail;
+                       failtest_suppress = true;
+                       ok1(tdb_deq(d, data));
+                       free(d.dptr);
                        ok1(tdb_check(tdb, NULL, NULL) == 0);
                        tdb_close(tdb);
                }
        }
        ok1(tap_log_messages == 0);
        return exit_status();
+
+fail:
+       failtest_suppress = true;
+       tdb_close(tdb);
+       failtest_exit(exit_status());
 }