diff options
Diffstat (limited to 'lib/tdb2/test/run-tdb1-nested-transactions.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-nested-transactions.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/lib/tdb2/test/run-tdb1-nested-transactions.c b/lib/tdb2/test/run-tdb1-nested-transactions.c index 408987b58e..a6a815363c 100644 --- a/lib/tdb2/test/run-tdb1-nested-transactions.c +++ b/lib/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(30); + plan_tests(29); key.dsize = strlen("hi"); key.dptr = (void *)"hi"; @@ -24,7 +24,7 @@ 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); @@ -32,14 +32,13 @@ int main(int argc, char *argv[]) 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(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); + 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); @@ -50,21 +49,22 @@ 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(tdb_transaction_start(tdb) == TDB_SUCCESS); + ok1(tdb_transaction_start(tdb) == TDB_SUCCESS); ok1(tdb_delete(tdb, key) == TDB_SUCCESS); - ok1(tdb1_transaction_commit(tdb) == 0); + ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS); ok1(!tdb_exists(tdb, key)); - ok1(tdb1_transaction_cancel(tdb) == 0); + tdb_transaction_cancel(tdb); + ok1(tap_log_messages == 0); /* Surprise! Kills inner "committed" transaction. */ ok1(tdb_exists(tdb, key)); - ok1(tdb1_transaction_start(tdb) == 0); - ok1(tdb1_transaction_start(tdb) == 0); + ok1(tdb_transaction_start(tdb) == TDB_SUCCESS); + ok1(tdb_transaction_start(tdb) == TDB_SUCCESS); ok1(tdb_delete(tdb, key) == TDB_SUCCESS); - ok1(tdb1_transaction_commit(tdb) == 0); + ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS); ok1(!tdb_exists(tdb, key)); - ok1(tdb1_transaction_commit(tdb) == 0); + ok1(tdb_transaction_commit(tdb) == TDB_SUCCESS); ok1(!tdb_exists(tdb, key)); tdb_close(tdb); |