tdb2: suppress failtest more than once on mmap.

[ccan] / ccan / tdb2 / test / run-tdb1-readonly-check.c

diff --git a/ccan/tdb2/test/run-tdb1-readonly-check.c b/ccan/tdb2/test/run-tdb1-readonly-check.c
index b712e48aa3fc2bff28397a4634585076397955e0..f42a8f5e27464d2870fc0d385e38c66e9399d470 100644 (file)
--- a/ccan/tdb2/test/run-tdb1-readonly-check.c
+++ b/ccan/tdb2/test/run-tdb1-readonly-check.c
@@ -1,5 +1,5 @@
-/* We should be able to tdb1_check a O_RDONLY tdb, and we were previously allowed
- * to tdb1_check() inside a transaction (though that's paranoia!). */
+/* We should be able to tdb_check a O_RDONLY tdb, and we were previously allowed
+ * to tdb_check() inside a transaction (though that's paranoia!). */
 #include "tdb2-source.h"
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
@@ -16,10 +16,10 @@ int main(int argc, char *argv[])
        hsize.base.next = &tap_log_attr;
        hsize.tdb1_hashsize.hsize = 1024;
 
-       plan_tests(11);
-       tdb = tdb1_open("run-readonly-check.tdb",
-                       TDB_DEFAULT,
-                       O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
+       plan_tests(10);
+       tdb = tdb_open("run-readonly-check.tdb1",
+                      TDB_VERSION1,
+                      O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize);
 
        ok1(tdb);
        key.dsize = strlen("hi");
@@ -27,22 +27,21 @@ int main(int argc, char *argv[])
        data.dsize = strlen("world");
        data.dptr = (void *)"world";
 
-       ok1(tdb1_store(tdb, key, data, TDB_INSERT) == 0);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
+       ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
 
        /* We are also allowed to do a check inside a transaction. */
-       ok1(tdb1_transaction_start(tdb) == 0);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       ok1(tdb1_close(tdb) == 0);
+       ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       ok1(tdb_close(tdb) == 0);
 
-       tdb = tdb1_open("run-readonly-check.tdb",
-                       TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr);
+       tdb = tdb_open("run-readonly-check.tdb1",
+                      TDB_DEFAULT, O_RDONLY, 0, &tap_log_attr);
 
        ok1(tdb);
-       ok1(tdb1_store(tdb, key, data, TDB_MODIFY) == -1);
-       ok1(tdb_error(tdb) == TDB_ERR_RDONLY);
-       ok1(tdb1_check(tdb, NULL, NULL) == 0);
-       ok1(tdb1_close(tdb) == 0);
+       ok1(tdb_store(tdb, key, data, TDB_MODIFY) == TDB_ERR_RDONLY);
+       ok1(tdb_check(tdb, NULL, NULL) == TDB_SUCCESS);
+       ok1(tdb_close(tdb) == 0);
 
        return exit_status();
 }