diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2013-09-21 22:06:54 -0700 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2013-09-23 01:29:10 +0200 |
| commit | a3f25f25113d83a605638fa2806014ad9972f919 (patch) | |
| tree | 7b0c4e282d9ed3e7ca94926a2ef51b9348a96ff4 | |
| parent | 038a9a7c5ec964e5b42e1329eab0573e50a9d3b0 (diff) | |
| download | samba-a3f25f25113d83a605638fa2806014ad9972f919.tar.gz samba-a3f25f25113d83a605638fa2806014ad9972f919.tar.bz2 samba-a3f25f25113d83a605638fa2806014ad9972f919.zip | |
selftst: add tests based on 4.1.0rc3 to check for zero invocationID in replPropertyMetaData
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>
Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Mon Sep 23 01:29:10 CEST 2013 on sn-devel-104
| -rw-r--r-- | selftest/tests.py | 1 | ||||
| -rwxr-xr-x | testprogs/blackbox/dbcheck-oldrelease.sh | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/selftest/tests.py b/selftest/tests.py index aebfc57630..7b371112ed 100644 --- a/selftest/tests.py +++ b/selftest/tests.py @@ -61,6 +61,7 @@ planpythontestsuite("none", "samba.tests.samba3sam") planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")]) plantestsuite("samba4.blackbox.dbcheck.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration]) plantestsuite("samba4.blackbox.dbcheck.release-4-0-0", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-0-0', configuration]) +plantestsuite("samba4.blackbox.dbcheck.release-4-1-0rc3", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "dbcheck-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-1-0rc3', configuration]) plantestsuite("samba4.blackbox.upgradeprovision.alpha13", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), '$PREFIX_ABS/provision', 'alpha13', configuration]) plantestsuite("samba4.blackbox.upgradeprovision.release-4-0-0", "none" , ["PYTHON=%s" % python, os.path.join(bbdir, "upgradeprovision-oldrelease.sh"), '$PREFIX_ABS/provision', 'release-4-0-0', configuration]) planpythontestsuite("none", "samba.tests.upgradeprovision") diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index fd66375d15..e536e84230 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -37,13 +37,21 @@ dbcheck_clean() { $PYTHON $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ } -# This should 'fail', because it returns the number of modified records +# This should 'fail', because it returns the number of modified records. +# We don't need to run this against 4.1.0rc3 dbcheck_acl_reset() { + if [ x$RELEASE != x"release-4-1-0rc3" ]; then $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + else + return 1 + fi } -# But having fixed it all up, this should pass +# But having fixed it all up, this should pass. +# We don't need to run this against 4.1.0rc3 dbcheck_acl_reset_clean() { + if [ x$RELEASE != x"release-4-1-0rc3" ]; then $PYTHON $BINDIR/samba-tool dbcheck --reset-well-known-acls --cross-ncs -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb $@ + fi } referenceprovision() { |