diff options
| author | Garming Sam <garming@catalyst.net.nz> | 2018-02-28 12:17:46 +1300 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-03-01 09:53:45 +0100 |
| commit | 43ca89b46bc76d10fb9bfda1d4ac7d16cf55b689 (patch) | |
| tree | e46352271da323ba54744b768e1225f68aa48c75 /testprogs | |
| parent | 1aabfff8a6ecd57ac6475667c2103eb8e3ec6bf3 (diff) | |
| download | samba-43ca89b46bc76d10fb9bfda1d4ac7d16cf55b689.tar.gz | |
tests/dbcheck: Provision using the old schema and ignore displayName
These tests are currently not run on Ubuntu due to bashisms in the test.
Signed-off-by: Garming Sam <garming@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'testprogs')
| -rwxr-xr-x | testprogs/blackbox/dbcheck-oldrelease.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/testprogs/blackbox/dbcheck-oldrelease.sh b/testprogs/blackbox/dbcheck-oldrelease.sh index 55e6ddf4f02..0949d324aaa 100755 --- a/testprogs/blackbox/dbcheck-oldrelease.sh +++ b/testprogs/blackbox/dbcheck-oldrelease.sh @@ -367,13 +367,16 @@ check_expected_after_deleted_objects() { referenceprovision() { if [ x$RELEASE == x"release-4-0-0" ]; then - $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 + $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=SAMBA --host-name=ares --realm=${RELEASE}.samba.corp --targetdir=$PREFIX_ABS/${RELEASE}_reference --use-ntvfs --host-ip=127.0.0.1 --host-ip6=::1 --function-level=2003 --base-schema=2008_R2_old + + # on top of this, also apply 2008R2 changes we accidentally missed in the past + $PYTHON $BINDIR/samba-tool domain schemaupgrade -H tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --ldf-file=samba-4.7-missing-for-schema45.ldif,fix-forest-rev.ldf fi } ldapcmp() { if [ x$RELEASE == x"release-4-0-0" ]; then - $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord + $PYTHON $BINDIR/samba-tool ldapcmp tdb://$PREFIX_ABS/${RELEASE}_reference/private/sam.ldb tdb://$PREFIX_ABS/${RELEASE}/private/sam.ldb --two --skip-missing-dn --filter=dnsRecord,displayName fi } |