diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
---|---|---|
committer | Rusty Russell <rusty@rustcorp.com.au> | 2011-09-14 08:13:26 +0930 |
commit | 01b2214a1893db5071addf1fdf17e9ac06ed63a0 (patch) | |
tree | e3fe69fccee166bef42e4dbad2bc2f1655824fdb /lib/tdb2/test/run-90-get-set-attributes.c | |
parent | ef70f5dd35974115a85850d04b0f4b64e511659f (diff) | |
download | samba-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-90-get-set-attributes.c')
-rw-r--r-- | lib/tdb2/test/run-90-get-set-attributes.c | 61 |
1 files changed, 45 insertions, 16 deletions
diff --git a/lib/tdb2/test/run-90-get-set-attributes.c b/lib/tdb2/test/run-90-get-set-attributes.c index e2cde96a96..4cbbda03c7 100644 --- a/lib/tdb2/test/run-90-get-set-attributes.c +++ b/lib/tdb2/test/run-90-get-set-attributes.c @@ -24,27 +24,31 @@ 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 }; union tdb_attribute seed_attr; union tdb_attribute hash_attr; union tdb_attribute lock_attr; + seed_attr.base.attr = TDB_ATTRIBUTE_SEED; + seed_attr.base.next = &hash_attr; + seed_attr.seed.seed = 100; + hash_attr.base.attr = TDB_ATTRIBUTE_HASH; - hash_attr.base.next = &seed_attr; + hash_attr.base.next = &lock_attr; hash_attr.hash.fn = hash_fn; hash_attr.hash.data = &hash_attr; - seed_attr.base.attr = TDB_ATTRIBUTE_SEED; - seed_attr.base.next = &lock_attr; - seed_attr.seed.seed = 100; - lock_attr.base.attr = TDB_ATTRIBUTE_FLOCK; lock_attr.base.next = &tap_log_attr; lock_attr.flock.lock = mylock; lock_attr.flock.unlock = myunlock; lock_attr.flock.data = &lock_attr; - plan_tests(sizeof(flags) / sizeof(flags[0]) * 50); + plan_tests(sizeof(flags) / sizeof(flags[0]) * 49 + + sizeof(flags) / sizeof(flags[0]) / 2); for (i = 0; i < sizeof(flags) / sizeof(flags[0]); i++) { union tdb_attribute attr; @@ -61,17 +65,26 @@ int main(int argc, char *argv[]) attr.base.attr = TDB_ATTRIBUTE_HASH; ok1(tdb_get_attribute(tdb, &attr) == 0); ok1(attr.base.attr == TDB_ATTRIBUTE_HASH); - ok1(attr.hash.fn == tdb_jenkins_hash); + if (flags[i] & TDB_VERSION1) { + ok1(attr.hash.fn == tdb1_old_hash); + } else { + ok1(attr.hash.fn == tdb_jenkins_hash); + } attr.base.attr = TDB_ATTRIBUTE_FLOCK; ok1(tdb_get_attribute(tdb, &attr) == 0); ok1(attr.base.attr == TDB_ATTRIBUTE_FLOCK); ok1(attr.flock.lock == tdb_fcntl_lock); ok1(attr.flock.unlock == tdb_fcntl_unlock); attr.base.attr = TDB_ATTRIBUTE_SEED; - ok1(tdb_get_attribute(tdb, &attr) == 0); - ok1(attr.base.attr == TDB_ATTRIBUTE_SEED); - /* This is possible, just astronomically unlikely. */ - ok1(attr.seed.seed != 0); + if (flags[i] & TDB_VERSION1) { + ok1(tdb_get_attribute(tdb, &attr) == TDB_ERR_EINVAL); + tap_log_messages = 0; + } else { + ok1(tdb_get_attribute(tdb, &attr) == 0); + ok1(attr.base.attr == TDB_ATTRIBUTE_SEED); + /* This is possible, just astronomically unlikely. */ + ok1(attr.seed.seed != 0); + } /* Unset attributes. */ tdb_unset_attribute(tdb, TDB_ATTRIBUTE_LOG); @@ -112,7 +125,17 @@ int main(int argc, char *argv[]) /* Now open with all attributes. */ tdb = tdb_open("run-90-get-set-attributes.tdb", flags[i], - O_RDWR|O_CREAT|O_TRUNC, 0600, &hash_attr); + O_RDWR|O_CREAT|O_TRUNC, 0600, + &seed_attr); + + if (flags[i] & TDB_VERSION1) { + ok1(!tdb); + ok1(tap_log_messages == 1); + tap_log_messages = 0; + tdb = tdb_open("run-90-get-set-attributes.tdb", flags[i], + O_RDWR|O_CREAT|O_TRUNC, 0600, + &hash_attr); + } ok1(tdb); /* Get will succeed */ @@ -136,9 +159,15 @@ int main(int argc, char *argv[]) ok1(attr.flock.data == &lock_attr); attr.base.attr = TDB_ATTRIBUTE_SEED; - ok1(tdb_get_attribute(tdb, &attr) == 0); - ok1(attr.base.attr == TDB_ATTRIBUTE_SEED); - ok1(attr.seed.seed == seed_attr.seed.seed); + if (flags[i] & TDB_VERSION1) { + ok1(tdb_get_attribute(tdb, &attr) == TDB_ERR_EINVAL); + ok1(tap_log_messages == 1); + tap_log_messages = 0; + } else { + ok1(tdb_get_attribute(tdb, &attr) == 0); + ok1(attr.base.attr == TDB_ATTRIBUTE_SEED); + ok1(attr.seed.seed == seed_attr.seed.seed); + } /* Unset attributes. */ tdb_unset_attribute(tdb, TDB_ATTRIBUTE_HASH); |