From 08f0562240155a871bd2a78d217db660e8ee3c91 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sat, 16 Feb 2013 01:07:27 +1100 Subject: selftest: Run dbcheck and improved upgrdeprovision tests against release-4-0-0 The improved upgradeprovision tests now call ldapcmp to verify the changes made do actually bring the database in line with a fresh provision. Andrew Bartlett Reviewed-by: Stefan Metzmacher --- testprogs/blackbox/upgradeprovision-alpha13.sh | 166 ------------------------- 1 file changed, 166 deletions(-) delete mode 100755 testprogs/blackbox/upgradeprovision-alpha13.sh (limited to 'testprogs/blackbox/upgradeprovision-alpha13.sh') diff --git a/testprogs/blackbox/upgradeprovision-alpha13.sh b/testprogs/blackbox/upgradeprovision-alpha13.sh deleted file mode 100755 index 16731b1077..0000000000 --- a/testprogs/blackbox/upgradeprovision-alpha13.sh +++ /dev/null @@ -1,166 +0,0 @@ -#!/bin/sh - -if [ $# -lt 1 ]; then -cat < $PREFIX_ABS/alpha13_upgrade/etc/smb.conf - - cp -a $alpha13_dir/private/*.keytab $PREFIX_ABS/alpha13_upgrade_full/private/ - cp -a $alpha13_dir/sysvol $PREFIX_ABS/alpha13_upgrade_full/ - mkdir $PREFIX_ABS/alpha13_upgrade_full/etc/ - cat $alpha13_dir/etc/smb.conf.template | \ - sed "s|@@PREFIX@@|$PREFIX_ABS/alpha13_upgrade_full|g" \ - > $PREFIX_ABS/alpha13_upgrade_full/etc/smb.conf -} - -remove_dns_user() { - # This is done, because otherwise the upgrdeprovision will not run without --full - $BINDIR/ldbdel -H tdb://$PREFIX_ABS/alpha13_upgrade/private/sam.ldb cn=dns,cn=users,dc=alpha13,dc=samba,dc=corp -} - -reindex() { - $BINDIR/samba-tool dbcheck --reindex -H tdb://$PREFIX_ABS/alpha13_upgrade/private/sam.ldb $@ -} - -# This should 'fail', because it returns the number of modified records -dbcheck() { - $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/alpha13_upgrade/private/sam.ldb $@ -} - -dbcheck_clean() { - $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/alpha13_upgrade/private/sam.ldb $@ -} - -# This should 'fail', because it returns the number of modified records -dbcheck_full() { - $BINDIR/samba-tool dbcheck --cross-ncs --fix --yes -H tdb://$PREFIX_ABS/alpha13_upgrade_full/private/sam.ldb $@ -} - -dbcheck_full_clean() { - $BINDIR/samba-tool dbcheck --cross-ncs -H tdb://$PREFIX_ABS/alpha13_upgrade_full/private/sam.ldb $@ -} - -upgradeprovision() { - $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/alpha13_upgrade/etc/smb.conf" --debugchange -} - -upgradeprovision_full() { - $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/alpha13_upgrade_full/etc/smb.conf" --full --debugchange -} - -samba_upgradedns() { - $PYTHON $BINDIR/samba_upgradedns --dns-backend=SAMBA_INTERNAL -s "$PREFIX_ABS/alpha13_upgrade_full/etc/smb.conf" -} - -referenceprovision() { - $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=alpha13.samba.corp --targetdir=$PREFIX_ABS/alpha13_upgrade_reference --use-ntvfs -} - -ldapcmp() { - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/alpha13_upgrade_reference/private/sam.ldb tdb://$PREFIX_ABS/alpha13_upgrade_full/private/sam.ldb --two --filter=dNSProperty,dnsRecord,cn,displayName,versionNumber,systemFlags,msDS-HasInstantiatedNCs --skip-missing-dn -} - -if [ -d $PREFIX_ABS/alpha13_upgrade ]; then - rm -fr $PREFIX_ABS/alpha13_upgrade -fi - -if [ -d $PREFIX_ABS/alpha13_upgrade_full ]; then - rm -fr $PREFIX_ABS/alpha13_upgrade_full -fi - -if [ -d $PREFIX_ABS/alpha13_upgrade_reference ]; then - rm -fr $PREFIX_ABS/alpha13_upgrade_reference -fi - -if [ -d $alpha13_dir ]; then - testit "alpha13" alpha13 - testit "remove_dns_user" remove_dns_user - testit "upgradeprovision" upgradeprovision - testit "upgradeprovision_full" upgradeprovision_full - testit "reindex" reindex - testit_expect_failure "dbcheck" dbcheck - testit "dbcheck_clean" dbcheck_clean - testit_expect_failure "dbcheck_full" dbcheck_full - testit "dbcheck_full_clean" dbcheck_full_clean - testit "referenceprovision" referenceprovision - testit "samba_upgradedns" samba_upgradedns - testit "ldapcmp" ldapcmp -else - subunit_start_test "alpha13" - subunit_skip_test "alpha13" <