strsplit: remove nump argument

[ccan] / ccan / tdb / test / run-nested-traverse.c

diff --git a/ccan/tdb/test/run-nested-traverse.c b/ccan/tdb/test/run-nested-traverse.c
index df4c7da13374d8befdcc37aa1a79590717e9d739..c58b24c0fafe8a6f3110d138377a2ed467c3fd94 100644 (file)
--- a/ccan/tdb/test/run-nested-traverse.c
+++ b/ccan/tdb/test/run-nested-traverse.c
@@ -1,20 +1,26 @@
 #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/tdb/hash.c>
+#include <ccan/tap/tap.h>
+#undef fcntl
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
-#include "external-transaction.h"
+#include "external-agent.h"
+#include "logging.h"
 
-static int agent;
+static struct agent *agent;
 
 static bool correct_key(TDB_DATA key)
 {
@@ -41,11 +47,13 @@ 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_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        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_START, tdb_name(tdb))
+           == WOULD_HAVE_BLOCKED);
        return 0;
 }
 
@@ -54,16 +62,20 @@ int main(int argc, char *argv[])
        struct tdb_context *tdb;
        TDB_DATA key, data;
 
-       plan_tests(15);
+       plan_tests(17);
        agent = prepare_external_agent();
-       if (agent < 0)
+       if (!agent)
                err(1, "preparing agent");
 
-       tdb = tdb_open("/tmp/test3.tdb", 1024, TDB_CLEAR_IF_FIRST,
-                      O_CREAT|O_TRUNC|O_RDWR, 0600);
+       tdb = tdb_open_ex("run-nested-traverse.tdb", 1024, TDB_CLEAR_IF_FIRST,
+                         O_CREAT|O_TRUNC|O_RDWR, 0600, &taplogctx, NULL);
        ok1(tdb);
 
-       ok1(external_agent_transaction(agent, tdb_name(tdb)));
+       ok1(external_agent_operation(agent, OPEN, tdb_name(tdb)) == SUCCESS);
+       ok1(external_agent_operation(agent, TRANSACTION_START, tdb_name(tdb))
+           == SUCCESS);
+       ok1(external_agent_operation(agent, TRANSACTION_COMMIT, tdb_name(tdb))
+           == SUCCESS);
 
        key.dsize = strlen("hi");
        key.dptr = (void *)"hi";