diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 07:55:13 +0930 |
| commit | 30294c7b91456dd49b89a9b26eb0b1066087815c (patch) | |
| tree | 8bf72d6834fafb9e030d120e7f6c881068cdb3af /lib/tdb2/test/run-tdb1-no-lock-during-traverse.c | |
| parent | e6cbc0f00ec9ecb4c014ee484746d565382d5f67 (diff) | |
| download | samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.gz samba-30294c7b91456dd49b89a9b26eb0b1066087815c.tar.bz2 samba-30294c7b91456dd49b89a9b26eb0b1066087815c.zip | |
tdb2: unify tdb1_traverse into tdb_traverse
Switch on the TDB_VERSION1 flag; we now only do a tdb1_traverse_read on a
read-only database, as there is no tdb2 equivalent.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
(Imported from CCAN commit cc2d609dfca7192305ad477b8c2b52cfdc1aa9be)
Diffstat (limited to 'lib/tdb2/test/run-tdb1-no-lock-during-traverse.c')
| -rw-r--r-- | lib/tdb2/test/run-tdb1-no-lock-during-traverse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c index 383b74cb87..71404c2d75 100644 --- a/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c +++ b/lib/tdb2/test/run-tdb1-no-lock-during-traverse.c @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) hsize.base.next = &tap_log_attr; hsize.tdb1_hashsize.hsize = 1024; - plan_tests(41); + plan_tests(43); tdb = tdb_open("run-no-lock-during-traverse.tdb1", TDB_VERSION1, O_CREAT|O_TRUNC|O_RDWR, 0600, &hsize); @@ -84,7 +84,7 @@ int main(int argc, char *argv[]) ok1(locking_errors1 == 0); ok1(tdb1_lockall(tdb) == 0); ok1(locking_errors1 == 0); - tdb1_traverse(tdb, delete_other, &errors); + ok1(tdb_traverse(tdb, delete_other, &errors) >= 0); ok1(errors == 0); ok1(locking_errors1 == 0); ok1(tdb1_unlockall(tdb) == 0); @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) ok1(locking_errors1 == 0); ok1(tdb1_lockall(tdb) == 0); ok1(locking_errors1 == 0); - tdb1_traverse(tdb, delete_self, NULL); + ok1(tdb_traverse(tdb, delete_self, NULL) == NUM_ENTRIES); ok1(locking_errors1 == 0); ok1(tdb1_unlockall(tdb) == 0); |