diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2017-12-18 12:30:44 +1300 |
|---|---|---|
| committer | Garming Sam <garming@samba.org> | 2017-12-20 23:13:12 +0100 |
| commit | c4895cfd9ae77b980ed47d0e08d9b19d850a9e65 (patch) | |
| tree | 95a7bb51dcb91e2ad681dfb8f5df26be18edd389 | |
| parent | aee8464aaa01a1740eeab6e47d76621d8e7c740c (diff) | |
| download | samba-c4895cfd9ae77b980ed47d0e08d9b19d850a9e65.tar.gz | |
upgradeprovision: Mark tests as passing again (using functional prep)
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rw-r--r-- | python/samba/netcmd/domain.py | 3 | ||||
| -rw-r--r-- | selftest/knownfail.d/functionalprep | 1 | ||||
| -rwxr-xr-x | testprogs/blackbox/upgradeprovision-oldrelease.sh | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/python/samba/netcmd/domain.py b/python/samba/netcmd/domain.py index 45e5f6e46cd..a3dd565871a 100644 --- a/python/samba/netcmd/domain.py +++ b/python/samba/netcmd/domain.py @@ -98,6 +98,7 @@ from samba.provision.common import ( ) string_version_to_constant = { + "2008_R2" : DS_DOMAIN_FUNCTION_2008_R2, "2012": DS_DOMAIN_FUNCTION_2012, "2012_R2": DS_DOMAIN_FUNCTION_2012_R2, } @@ -4195,7 +4196,7 @@ class cmd_domain_functional_prep(Command): Option("--quiet", help="Be quiet", action="store_true"), Option("--verbose", help="Be verbose", action="store_true"), Option("--function-level", type="choice", metavar="FUNCTION_LEVEL", - choices=["2012", "2012_R2"], + choices=["2008_R2", "2012", "2012_R2"], help="The schema file to upgrade to. Default is (Windows) 2012_R2.", default="2012_R2"), Option("--forest-prep", action="store_true", diff --git a/selftest/knownfail.d/functionalprep b/selftest/knownfail.d/functionalprep deleted file mode 100644 index 6e376dd8c07..00000000000 --- a/selftest/knownfail.d/functionalprep +++ /dev/null @@ -1 +0,0 @@ -^samba4.blackbox.upgradeprovision.release-4-0-0.ldapcmp_full_sd diff --git a/testprogs/blackbox/upgradeprovision-oldrelease.sh b/testprogs/blackbox/upgradeprovision-oldrelease.sh index a4a0746b308..8d84457bc17 100755 --- a/testprogs/blackbox/upgradeprovision-oldrelease.sh +++ b/testprogs/blackbox/upgradeprovision-oldrelease.sh @@ -84,9 +84,15 @@ upgradeprovision() { # 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,fix-forest-rev.ldf + + # add missing domain prep for 2008R2 + $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade/private/sam.ldb --domain --function-level 2008_R2 } upgradeprovision_full() { + # add missing domain prep for 2008R2 + $BINDIR/samba-tool domain functionalprep -H tdb://$PREFIX_ABS/${RELEASE}_upgrade_full/private/sam.ldb --domain --function-level 2008_R2 + $PYTHON $BINDIR/samba_upgradeprovision -s "$PREFIX_ABS/${RELEASE}_upgrade_full/etc/smb.conf" --full --debugchange } |