X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-tdb1-nested-transactions.c;h=149e5318a09efdcb69bf49d94bbbfd9f441566ff;hb=27647f94668040d91de377849dce87dabd72be69;hp=6a10b46b1b64886d5a1b4ff2f122d9112d022a16;hpb=98c754ffe65bc335f66161d6cc8705d4ea2710ec;p=ccan

diff --git a/ccan/tdb2/test/run-tdb1-nested-transactions.c b/ccan/tdb2/test/run-tdb1-nested-transactions.c
index 6a10b46b..149e5318 100644
--- a/ccan/tdb2/test/run-tdb1-nested-transactions.c
+++ b/ccan/tdb2/test/run-tdb1-nested-transactions.c
@@ -15,7 +15,7 @@ int main(int argc, char *argv[])
 	hsize.base.next = &tap_log_attr;
 	hsize.tdb1_hashsize.hsize = 1024;
 
-	plan_tests(27);
+	plan_tests(30);
 	key.dsize = strlen("hi");
 	key.dptr = (void *)"hi";
 
@@ -24,23 +24,23 @@ int main(int argc, char *argv[])
 	ok1(tdb);
 
 	/* No nesting by default. */
-	ok1(tdb1_transaction_start(tdb) == 0);
+	ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
 	data.dptr = (void *)"world";
 	data.dsize = strlen("world");
 	ok1(tdb_store(tdb, key, data, TDB_INSERT) == TDB_SUCCESS);
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
-	ok1(tdb1_transaction_start(tdb) != 0);
-	ok1(tdb_error(tdb) == TDB_ERR_EINVAL);
+	ok1(tdb_transaction_start(tdb) == TDB_ERR_EINVAL);
+	ok1(tap_log_messages == 1);
 
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
-	ok1(tdb1_transaction_commit(tdb) == 0);
-	data = tdb1_fetch(tdb, key);
+	ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+	ok1(tdb_fetch(tdb, key, &data) == TDB_SUCCESS);
 	ok1(data.dsize == strlen("world"));
 	ok1(memcmp(data.dptr, "world", strlen("world")) == 0);
 	free(data.dptr);
@@ -50,22 +50,23 @@ int main(int argc, char *argv[])
 		       TDB_ALLOW_NESTING, O_RDWR, 0, &tap_log_attr);
 	ok1(tdb);
 
-	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_delete(tdb, key) == 0);
-	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
-	ok1(tdb1_transaction_cancel(tdb) == 0);
+	ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+	ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
+	ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+	ok1(!tdb_exists(tdb, key));
+	tdb_transaction_cancel(tdb);
+	ok1(tap_log_messages == 1);
 	/* Surprise! Kills inner "committed" transaction. */
-	ok1(tdb1_exists(tdb, key));
+	ok1(tdb_exists(tdb, key));
 
-	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_transaction_start(tdb) == 0);
-	ok1(tdb1_delete(tdb, key) == 0);
-	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
-	ok1(tdb1_transaction_commit(tdb) == 0);
-	ok1(!tdb1_exists(tdb, key));
+	ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+	ok1(tdb_transaction_start(tdb) == TDB_SUCCESS);
+	ok1(tdb_delete(tdb, key) == TDB_SUCCESS);
+	ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+	ok1(!tdb_exists(tdb, key));
+	ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS);
+	ok1(!tdb_exists(tdb, key));
 	tdb_close(tdb);
 
 	return exit_status();