summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2011-11-01 12:59:38 +1100
committerAndrew Bartlett <abartlet@samba.org>2011-11-17 00:34:08 +0100
commitb8c119f3ba0872e4416caecb8fb508cd70781c56 (patch)
treebcb47b887750e45847ca314b3fd254a8beb7d5f9
parent9524e2fce1b7f644fef5f7c8134f72681d786e65 (diff)
downloadsamba-b8c119f3ba0872e4416caecb8fb508cd70781c56.tar.gz
samba-b8c119f3ba0872e4416caecb8fb508cd70781c56.tar.bz2
samba-b8c119f3ba0872e4416caecb8fb508cd70781c56.zip
s4-s3-upgrade Add test of net getlocalsid after the upgrade
Pair-Programmed-With: Amitay Isaacs <amitay@samba.org>
-rwxr-xr-xsource4/setup/tests/blackbox_s3upgrade.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index f93b43f6b9..5b137af097 100755
--- a/source4/setup/tests/blackbox_s3upgrade.sh
+++ b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -12,6 +12,7 @@ shift 1
samba4bindir="$BINDIR"
samba_tool="$samba4bindir/samba-tool$EXEEXT"
+samba_net="$samba4bindir/net$EXEEXT"
testparm="$samba4bindir/testparm$EXEEXT"
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
@@ -39,6 +40,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
EOF
testit "samba3-upgrade-member" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb1.conf --targetdir=$PREFIX/samba3-upgrade/s4_1 --dbdir=$PREFIX/samba3-upgrade/samba3
+testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade -s $PREFIX/samba3-upgrade/s4_1/etc/smb.conf
# Test 2 (s3 dc)
cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
@@ -60,6 +62,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
EOF
testit "samba3-upgrade-dc" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_2 --dbdir=$PREFIX/samba3-upgrade/samba3
+testit "samba3-upgrade-dc-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf
#Run final test without a wins.dat
rm -f $PREFIX/samba3-upgrade/samba3/wins.dat
@@ -84,6 +87,7 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
EOF
testit "samba3-upgrade-testparm" $samba_tool domain samba3upgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_3 --testparm=$testparm
+testit "samba3-upgrade-testparm-getlocalsid" $samba_net getlocalsid samba -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf
rm -rf $PREFIX/samba3-upgrade