tdb2: suppress failtest more than once on mmap.

[ccan] / ccan / tdb2 / test / run-tdb1-nested-transactions.c

diff --git a/ccan/tdb2/test/run-tdb1-nested-transactions.c b/ccan/tdb2/test/run-tdb1-nested-transactions.c
index 2518003c634d06b464bba28d98ac82818e2aec84..149e5318a09efdcb69bf49d94bbbfd9f441566ff 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-nested-transactions.c
+++ b/ccan/tdb2/test/run-tdb1-nested-transactions.c
@@ -3,66 +3,71 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
-#include "tdb1-logging.h"
+#include "logging.h"
 
 int main(int argc, char *argv[])
 {
-       struct tdb1_context *tdb;
-       TDB1_DATA key, data;
+       struct tdb_context *tdb;
+       TDB_DATA key, data;
+       union tdb_attribute hsize;
 
-       plan_tests(27);
+       hsize.base.attr = TDB_ATTRIBUTE_TDB1_HASHSIZE;
+       hsize.base.next = &tap_log_attr;
+       hsize.tdb1_hashsize.hsize = 1024;
+
+       plan_tests(30);
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";
 
-       tdb = tdb1_open_ex("run-nested-transactions.tdb",
-                         1024, TDB1_CLEAR_IF_FIRST|TDB1_DISALLOW_NESTING,
-                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
+       tdb = tdb_open("run-nested-transactions.tdb1",
+                      TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
        ok1(tdb);
 
-       ok1(tdb1_transaction_start(tdb) == 0);
+       /* No nesting by default. */
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
        data.dptr = (void *)"world";
        data.dsize = strlen("world");
-       ok1(tdb1_store(tdb, key, data, TDB1_INSERT) == 0);
-       data = tdb1_fetch(tdb, key);
+       ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+       ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
        free(data.dptr);
-       ok1(tdb1_transaction_start(tdb) != 0);
-       ok1(tdb1_error(tdb) == TDB1_ERR_NESTING);
+       ok1(tdb_transaction_start(tdb) == TDB_ERR_EINVAL);
+       ok1(tap_log_messages == 1);
 
-       data = tdb1_fetch(tdb, key);
+       ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
        free(data.dptr);
-       ok1(tdb1_transaction_commit(tdb) == 0);
-       data = tdb1_fetch(tdb, key);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+       ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
        ok1(data.dsize == strlen("world"));
        ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
        free(data.dptr);
-       tdb1_close(tdb);
+       tdb_close(tdb);
 
-       /* Allow nesting by default. */
-       tdb = tdb1_open_ex("run-nested-transactions.tdb",
-                         1024, TDB1_DEFAULT, O_RDWR, 0, &taplogctx, NULL);
+       tdb = tdb_open("run-nested-transactions.tdb1",
+                      TDB_ALLOW_NESTING, O_RDWR, 0, &tap_log_attr);
        ok1(tdb);
 
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_delete(tdb, key) == 0);
-       ok1(tdb1_transaction_commit(tdb) == 0);
-       ok1(!tdb1_exists(tdb, key));
-       ok1(tdb1_transaction_cancel(tdb) == 0);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+       ok1(!tdb_exists(tdb, key));
+       tdb_transaction_cancel(tdb);
+       ok1(tap_log_messages == 1);
        /* Surprise! Kills inner "committed" transaction. */
-       ok1(tdb1_exists(tdb, key));
+       ok1(tdb_exists(tdb, key));
 
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_delete(tdb, key) == 0);
-       ok1(tdb1_transaction_commit(tdb) == 0);
-       ok1(!tdb1_exists(tdb, key));
-       ok1(tdb1_transaction_commit(tdb) == 0);
-       ok1(!tdb1_exists(tdb, key));
-       tdb1_close(tdb);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+       ok1(!tdb_exists(tdb, key));
+       ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+       ok1(!tdb_exists(tdb, key));
+       tdb_close(tdb);
 
        return exit_status();
 }