X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-traverse.c;h=02335d6a82332f8085e387d4de506ee74539d84c;hp=e3c2a895ff190beb9a2e03eeccee617943f8a1bc;hb=02d83e6adfd34fe62aa4fe2bc4dbc3c4a13bd5f6;hpb=5e8b9af5e7fe5f1ccac407873a3b782b8a629782 diff --git a/ccan/tdb2/test/run-traverse.c b/ccan/tdb2/test/run-traverse.c index e3c2a895..02335d6a 100644 --- a/ccan/tdb2/test/run-traverse.c +++ b/ccan/tdb2/test/run-traverse.c @@ -56,7 +56,6 @@ 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); return -1; @@ -120,7 +119,7 @@ int main(int argc, char *argv[]) hattr.base.next = &tap_log_attr; - plan_tests(sizeof(flags) / sizeof(flags[0]) * 50 + 1); + plan_tests(sizeof(flags) / sizeof(flags[0]) * 53 + 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); @@ -182,6 +181,7 @@ int main(int argc, char *argv[]) ok1(td.low <= NUM_RECORDS / 2); ok1(td.high > NUM_RECORDS / 2); ok1(tdb_check(tdb, NULL, NULL) == 0); + ok1(tap_log_messages == 0); /* Growing traverse. Expect failure on r/o traverse. */ tgd.calls = 0; @@ -193,6 +193,8 @@ int main(int argc, char *argv[]) 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. */ @@ -209,6 +211,8 @@ int main(int argc, char *argv[]) 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). */