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 b184474f097f757f7bc21bb7c85eb5e24c612428..c7079cf6828eb39deb3665950c5913684f6a0b2c 100644 (file)
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -1,17 +1,24 @@
 #define _XOPEN_SOURCE 500
-#include "tdb/tdb.h"
-#include "tdb/io.c"
-#include "tdb/tdb.c"
-#include "tdb/lock.c"
-#include "tdb/freelist.c"
-#include "tdb/traverse.c"
-#include "tdb/transaction.c"
-#include "tdb/error.c"
-#include "tdb/open.c"
-#include "tap/tap.h"
+#include "lock-tracking.h"
+#define fcntl fcntl_with_lockcheck
+#include <ccan/tdb/tdb.h>
+#include <ccan/tdb/io.c>
+#include <ccan/tdb/tdb.c>
+#include <ccan/tdb/lock.c>
+#include <ccan/tdb/freelist.c>
+#include <ccan/tdb/traverse.c>
+#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>
+#undef fcntl_with_lockcheck
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
+#include "external-agent.h"
+
+static struct agent *agent;
 
 static bool correct_key(TDB_DATA key)
 {
@@ -38,12 +45,15 @@ int main(int argc, char *argv[])
        struct tdb_context *tdb;
        TDB_DATA key, data;
 
-       plan_tests(12);
-       tdb = tdb_open("/tmp/test.tdb", 1024, TDB_CLEAR_IF_FIRST,
-                      O_CREAT|O_TRUNC|O_RDWR, 0600);
+       plan_tests(13);
+       agent = prepare_external_agent();
+       if (!agent)
+               err(1, "preparing agent");
+
+       tdb = tdb_open("run-traverse-in-transaction.tdb",
+                      1024, TDB_CLEAR_IF_FIRST, O_CREAT|O_TRUNC|O_RDWR, 0600);
        ok1(tdb);
 
-       /* Tickle bug on appending zero length buffer to zero length buffer. */
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";
        data.dptr = (void *)"world";
@@ -51,18 +61,25 @@ int main(int argc, char *argv[])
 
        ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 
+       ok1(external_agent_operation(agent, OPEN, tdb_name(tdb)) == SUCCESS);
+
        ok1(tdb_transaction_start(tdb) == 0);
-       ok(tdb->have_transaction_lock, "Transaction lock in transaction");
+       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! */
-       ok(tdb->have_transaction_lock, "Transaction lock after traverse");
+       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! */
-       ok(tdb->have_transaction_lock, "Transaction lock after traverse_read");
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        ok1(tdb_transaction_commit(tdb) == 0);
-       ok(!tdb->have_transaction_lock, "Transaction unlock");
+       /* Now we should be fine. */
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == SUCCESS);
 
        tdb_close(tdb);