X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb%2Ftest%2Frun-traverse-in-transaction.c;h=0043a98eaf3a714b2f99adc9b7bb04cd5423a11e;hp=b184474f097f757f7bc21bb7c85eb5e24c612428;hb=85a33135890965218010b79c89e4d3f4905727e3;hpb=ac0e87d7ecf790c187ce3c5d837b971fdd016b57;ds=sidebyside

diff --git a/ccan/tdb/test/run-traverse-in-transaction.c b/ccan/tdb/test/run-traverse-in-transaction.c
index b184474f..0043a98e 100644
--- a/ccan/tdb/test/run-traverse-in-transaction.c
+++ b/ccan/tdb/test/run-traverse-in-transaction.c
@@ -12,6 +12,9 @@
 #include <stdlib.h>
 #include <stdbool.h>
 #include <err.h>
+#include "external-transaction.h"
+
+static struct agent *agent;
 
 static bool correct_key(TDB_DATA key)
 {
@@ -38,12 +41,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,
+	plan_tests(13);
+	agent = prepare_external_agent();
+	if (!agent)
+		err(1, "preparing agent");
+
+	tdb = tdb_open("/tmp/test2.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 +57,21 @@ int main(int argc, char *argv[])
 
 	ok1(tdb_store(tdb, key, data, TDB_INSERT) == 0);
 
+	ok1(external_agent_transaction(agent, tdb_name(tdb)));
+
 	ok1(tdb_transaction_start(tdb) == 0);
-	ok(tdb->have_transaction_lock, "Transaction lock in transaction");
+	ok1(!external_agent_transaction(agent, tdb_name(tdb)));
 	tdb_traverse(tdb, traverse, NULL);
 
 	/* That should *not* release the transaction lock! */
-	ok(tdb->have_transaction_lock, "Transaction lock after traverse");
+	ok1(!external_agent_transaction(agent, tdb_name(tdb)));
 	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_transaction(agent, tdb_name(tdb)));
 	ok1(tdb_transaction_commit(tdb) == 0);
-	ok(!tdb->have_transaction_lock, "Transaction unlock");
+	/* Now we should be fine. */
+	ok1(external_agent_transaction(agent, tdb_name(tdb)));
 
 	tdb_close(tdb);