From: Andrew Bartlett Date: Tue, 12 Dec 2017 02:26:35 +0000 (+1300) Subject: selftest: Fix upgradeprovision test by importing new objects for schema 45 X-Git-Tag: talloc-2.1.11~185 X-Git-Url: http://git.samba.org/samba.git/?p=garming%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=f4d9b797e22a4cade3752930483bfc7a5a955338 selftest: Fix upgradeprovision test by importing new objects for schema 45 The recent schema changes mean that the upgradeprovision test starts failing. This is because it's using an old 4.0.0 schema (that doesn't have these schema changes), but it's comparing it against a fresh provision (which does have the changes). We can avoid this failure by using the 'samba-tool domain schemaupgrade' to bring the old 4.0.0 schema in line with a fresh provision. Note that the 'upgradeprovision --full' test doesn't need this change as it seems to more aggressively copy over any schema differences with a fresh provision. Signed-off-by: Andrew Bartlett Reviewed-by: Garming Sam --- diff --git a/selftest/knownfail.d/schema45 b/selftest/knownfail.d/schema45 deleted file mode 100644 index a95ed542664..00000000000 --- a/selftest/knownfail.d/schema45 +++ /dev/null @@ -1,3 +0,0 @@ -# This has a full set of extended rights for schema 45 in the -# new provision code, but not in the upgrade path -^samba4.blackbox.upgradeprovision.release-4-0-0.ldapcmp \ No newline at end of file diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh index 9042f079656..df054e868ad 100755 --- a/testprogs/blackbox/upgradeprovision-oldrelease.sh +++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh @@ -79,7 +79,11 @@ dbcheck_full_clean_well_known_acls() { } upgradeprovision() { + # bring the really old Samba schema in line with a more recent 2008R2 schema $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/${RELEASE}_upgrade/etc/smb.conf" --debugchange + + # on top of this, also apply 2008R2 changes we accidentally missed in the past + $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif } upgradeprovision_full() {