X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-traverse.c;h=0a6310027beaf3c4c6a3770e5b0b57eae1587eb0;hp=02335d6a82332f8085e387d4de506ee74539d84c;hb=b21004624683be5bf1d8f75e3b5be4e9618049ee;hpb=51a56b52627e635566253a3fae081c3f466b6bb6

diff --git a/ccan/tdb2/test/run-traverse.c b/ccan/tdb2/test/run-traverse.c
index 02335d6a..0a631002 100644
--- a/ccan/tdb2/test/run-traverse.c
+++ b/ccan/tdb2/test/run-traverse.c
@@ -56,8 +56,8 @@ static int trav(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf, void *p)
 		td->high = val;
 
 	if (td->delete) {
-		if (tdb_delete(tdb, key) != 0) {
-			td->delete_error = tdb_error(tdb);
+		td->delete_error = tdb_delete(tdb, key);
+		if (td->delete_error != TDB_SUCCESS) {
 			return -1;
 		}
 	}
@@ -95,8 +95,8 @@ static int trav_grow(struct tdb_context *tdb, TDB_DATA key, TDB_DATA dbuf,
 	/* Make a big difference to the database. */
 	dbuf.dptr = buffer;
 	dbuf.dsize = sizeof(buffer);
-	if (tdb_append(tdb, key, dbuf) != 0) {
-		tgd->error = tdb_error(tdb);
+	tgd->error = tdb_append(tdb, key, dbuf);
+	if (tgd->error != TDB_SUCCESS) {
 		return -1;
 	}
 	return 0;
@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
 
 	hattr.base.next = &tap_log_attr;
 
-	plan_tests(sizeof(flags) / sizeof(flags[0]) * 53 + 1);
+	plan_tests(sizeof(flags) / sizeof(flags[0]) * 32 + 1);
 	for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
 		tdb = tdb_open("run-traverse.tdb", flags[i],
 			       O_RDWR|O_CREAT|O_TRUNC, 0600, &hattr);
@@ -127,30 +127,12 @@ int main(int argc, char *argv[])
 		if (!tdb)
 			continue;
 
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == 0);
 		ok1(tdb_traverse(tdb, NULL, NULL) == 0);
 
 		ok1(store_records(tdb));
-		num = tdb_traverse_read(tdb, NULL, NULL);
-		ok1(num == NUM_RECORDS);
 		num = tdb_traverse(tdb, NULL, NULL);
 		ok1(num == NUM_RECORDS);
 
-		/* Full traverse (read-only). */
-		td.calls = 0;
-		td.call_limit = UINT_MAX;
-		td.low = INT_MAX;
-		td.high = INT_MIN;
-		td.mismatch = false;
-		td.delete = false;
-
-		num = tdb_traverse_read(tdb, trav, &td);
-		ok1(num == NUM_RECORDS);
-		ok1(!td.mismatch);
-		ok1(td.calls == NUM_RECORDS);
-		ok1(td.low == 0);
-		ok1(td.high == NUM_RECORDS-1);
-
 		/* Full traverse. */
 		td.calls = 0;
 		td.call_limit = UINT_MAX;
@@ -183,38 +165,6 @@ int main(int argc, char *argv[])
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 		ok1(tap_log_messages == 0);
 
-		/* Growing traverse.  Expect failure on r/o traverse. */
-		tgd.calls = 0;
-		tgd.num_large = 0;
-		tgd.mismatch = false;
-		tgd.error = TDB_SUCCESS;
-		num = tdb_traverse_read(tdb, trav_grow, &tgd);
-		ok1(num == 1);
-		ok1(tgd.error == TDB_ERR_RDONLY);
-		ok1(tgd.calls == 1);
-		ok1(!tgd.mismatch);
-		ok1(tap_log_messages == 1);
-		tap_log_messages = 0;
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
-		/* Deleting traverse.  Expect failure on r/o traverse. */
-		td.calls = 0;
-		td.call_limit = UINT_MAX;
-		td.low = INT_MAX;
-		td.high = INT_MIN;
-		td.mismatch = false;
-		td.delete = true;
-		td.delete_error = TDB_SUCCESS;
-		num = tdb_traverse_read(tdb, trav, &td);
-		ok1(num == 1);
-		ok1(td.delete_error == TDB_ERR_RDONLY);
-		ok1(!td.mismatch);
-		ok1(td.calls == 1);
-		ok1(td.low == td.high);
-		ok1(tap_log_messages == 1);
-		tap_log_messages = 0;
-		ok1(tdb_check(tdb, NULL, NULL) == 0);
-
 		/* Deleting traverse (delete everything). */
 		td.calls = 0;
 		td.call_limit = UINT_MAX;
@@ -233,12 +183,11 @@ int main(int argc, char *argv[])
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 		/* Now it's empty! */
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == 0);
 		ok1(tdb_traverse(tdb, NULL, NULL) == 0);
 
 		/* Re-add. */
 		ok1(store_records(tdb));
-		ok1(tdb_traverse_read(tdb, NULL, NULL) == NUM_RECORDS);
+		ok1(tdb_traverse(tdb, NULL, NULL) == NUM_RECORDS);
 		ok1(tdb_check(tdb, NULL, NULL) == 0);
 
 		/* Grow.  This will cause us to be reshuffled. */