summaryrefslogtreecommitdiff
path: root/lib/tdb2/test/run-fork-test.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:26 +0930
committerRusty Russell <rusty@rustcorp.com.au>2011-09-14 08:13:26 +0930
commit01b2214a1893db5071addf1fdf17e9ac06ed63a0 (patch)
treee3fe69fccee166bef42e4dbad2bc2f1655824fdb /lib/tdb2/test/run-fork-test.c
parentef70f5dd35974115a85850d04b0f4b64e511659f (diff)
downloadsamba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.tar.gz
samba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.tar.bz2
samba-01b2214a1893db5071addf1fdf17e9ac06ed63a0.zip
tdb2: test: try (almost) all tests with TDB_VERSION1 flag.
There are some minor changes required, in particular: 1) Make sure lockcheck understands tdb1 allrecord lock upgrades. 2) Handle tdb1 sequence number jumps: various operations increment the sequence number twice, especually tdb_append. 3) Don't test fail on unlock, since it gets triggered with traversal on the tdb1 backend (we didn't actually ever test this case for tdb2). 4) Move clear_if_first to offset 4, to match tdb1. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> (Imported from CCAN commit 818ed29730b030ce79855fc35c212b51adff3180)
Diffstat (limited to 'lib/tdb2/test/run-fork-test.c')
-rw-r--r--lib/tdb2/test/run-fork-test.c32
1 files changed, 29 insertions, 3 deletions
diff --git a/lib/tdb2/test/run-fork-test.c b/lib/tdb2/test/run-fork-test.c
index 2734742571..7ff71366cf 100644
--- a/lib/tdb2/test/run-fork-test.c
+++ b/lib/tdb2/test/run-fork-test.c
@@ -19,16 +19,24 @@
static enum TDB_ERROR fork_in_parse(TDB_DATA key, TDB_DATA data,
struct tdb_context *tdb)
{
- int status;
+ int status, extra_messages;
+
+ if (tdb_get_flags(tdb) & TDB_VERSION1) {
+ extra_messages = 1;
+ } else {
+ extra_messages = 0;
+ }
if (fork() == 0) {
/* We expect this to fail. */
if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
exit(1);
+ tap_log_messages -= extra_messages;
if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
exit(1);
+ tap_log_messages -= extra_messages;
if (tap_log_messages != 2)
exit(2);
@@ -47,13 +55,22 @@ int main(int argc, char *argv[])
unsigned int i;
struct tdb_context *tdb;
int flags[] = { TDB_DEFAULT, TDB_NOMMAP,
- TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT };
+ TDB_CONVERT, TDB_NOMMAP|TDB_CONVERT,
+ TDB_VERSION1, TDB_NOMMAP|TDB_VERSION1,
+ TDB_CONVERT|TDB_VERSION1,
+ TDB_NOMMAP|TDB_CONVERT|TDB_VERSION1 };
struct tdb_data key = tdb_mkdata("key", 3);
struct tdb_data data = tdb_mkdata("data", 4);
plan_tests(sizeof(flags) / sizeof(flags[0]) * 14);
for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) {
- int status;
+ int status, extra_messages;
+
+ if (flags[i] & TDB_VERSION1) {
+ extra_messages = 1;
+ } else {
+ extra_messages = 0;
+ }
tap_log_messages = 0;
@@ -70,9 +87,11 @@ int main(int argc, char *argv[])
/* We expect this to fail. */
if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tap_log_messages != 2)
return 2;
@@ -94,9 +113,11 @@ int main(int argc, char *argv[])
/* We expect this to fail. */
if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tap_log_messages != 2)
return 2;
@@ -119,9 +140,11 @@ int main(int argc, char *argv[])
/* This would always fail anyway... */
if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tap_log_messages != 2)
return 2;
@@ -145,15 +168,18 @@ int main(int argc, char *argv[])
/* We expect this to fail. */
if (tdb_store(tdb, key, data, TDB_REPLACE) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tdb_fetch(tdb, key, &data) != TDB_ERR_LOCK)
return 1;
+ tap_log_messages -= extra_messages;
if (tap_log_messages != 2)
return 2;
if (tdb_transaction_commit(tdb) != TDB_ERR_LOCK)
return 3;
+ tap_log_messages -= extra_messages;
tdb_close(tdb);
if (tap_log_messages < 3)