]> git.ozlabs.org Git - ccan/blobdiff - ccan/tdb/test/run-nested-traverse.c
tests: now we run in tmp dir, always create temporary files in this dir.
[ccan] / ccan / tdb / test / run-nested-traverse.c
index e78a14efddc49ca9bbbc05f687e47774c84beae4..156946af1fb82ce61a0856afbeee23554459125f 100644 (file)
@@ -8,6 +8,7 @@
 #include <ccan/tdb/transaction.c>
 #include <ccan/tdb/error.c>
 #include <ccan/tdb/open.c>
+#include <ccan/tdb/check.c>
 #include <ccan/tap/tap.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -41,11 +42,11 @@ static int traverse1(struct tdb_context *tdb, TDB_DATA key, TDB_DATA data,
 {
        ok1(correct_key(key));
        ok1(correct_data(data));
-       ok1(!external_agent_transaction(agent, tdb_name(tdb)));
+       ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
        tdb_traverse(tdb, traverse2, NULL);
 
        /* That should *not* release the transaction lock! */
-       ok1(!external_agent_transaction(agent, tdb_name(tdb)));
+       ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
        return 0;
 }
 
@@ -59,11 +60,11 @@ int main(int argc, char *argv[])
        if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb_open("/tmp/test3.tdb", 1024, TDB_CLEAR_IF_FIRST,
+       tdb = tdb_open("run-nested-traverse.tdb", 1024, TDB_CLEAR_IF_FIRST,
                       O_CREAT|O_TRUNC|O_RDWR, 0600);
        ok1(tdb);
 
-       ok1(external_agent_transaction(agent, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
 
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";