tdb: rewrite external agent for testing.

[ccan] / ccan / tdb / test / run-traverse-in-transaction.c

diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c
index 0a74055b6b0b778f35f0d81d327e31acd1723d64..c7079cf6828eb39deb3665950c5913684f6a0b2c 100644 (file)
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -1,4 +1,6 @@
 #define _XOPEN_SOURCE 500
+#include "lock-tracking.h"
+#define fcntl fcntl_with_lockcheck
 #include <ccan/tdb/tdb.h>
 #include <ccan/tdb/io.c>
 #include <ccan/tdb/tdb.c>
@@ -10,10 +12,11 @@
 #include <ccan/tdb/open.c>
 #include <ccan/tdb/check.c>
 #include <ccan/tap/tap.h>
+#undef fcntl_with_lockcheck
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
-#include "external-transaction.h"
+#include "external-agent.h"
 
 static struct agent *agent;
 
@@ -47,8 +50,8 @@ int main(int argc, char *argv[])
        if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb_open("/tmp/test2.tdb", 1024, TDB_CLEAR_IF_FIRST,
-                      O_CREAT|O_TRUNC|O_RDWR, 0600);
+       tdb = tdb_open("run-traverse-in-transaction.tdb",
+                      1024, TDB_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR, 0600);
        ok1(tdb);
 
        key.dsize = strlen("hi");
@@ -58,21 +61,25 @@ int main(int argc, char *argv[])
 
        ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 
-       ok1(external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, OPEN, tdb_name(tdb)) == SUCCESS);
 
        ok1(tdb_transaction_start(tdb) == 0);
-       ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        tdb_traverse(tdb, traverse, NULL);
 
        /* That should *not* release the transaction lock! */
-       ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        tdb_traverse_read(tdb, traverse, NULL);
 
        /* That should *not* release the transaction lock! */
-       ok1(!external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        ok1(tdb_transaction_commit(tdb) == 0);
        /* Now we should be fine. */
-       ok1(external_agent_operation(agent, TRANSACTION, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == SUCCESS);
 
        tdb_close(tdb);