python:tests: Store keys as bytes rather than as lists of ints

[samba.git] / source4 / setup / tests / blackbox_s3upgrade.sh

diff --git a/source4/setup/tests/blackbox_s3upgrade.sh b/source4/setup/tests/blackbox_s3upgrade.sh
index d968129ea1e34dd9ad8334d39958298650979ec1..908cb69b8dff9d8f3e77fcd450d17ca107c4d6fe 100755 (executable)
--- a/source4/setup/tests/blackbox_s3upgrade.sh
+++ b/source4/setup/tests/blackbox_s3upgrade.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
 if [ $# -lt 1 ]; then
-cat <<EOF
+       cat <<EOF
 Usage: blackbox_s3upgrade.sh PREFIX
 EOF
-exit 1;
+       exit 1
 fi
 
-PREFIX=`pwd`"/$1"
+PREFIX=$(pwd)"/$1"
 shift 1
 
 samba4bindir="$BINDIR"
@@ -15,14 +15,14 @@ samba_tool="$samba4bindir/samba-tool"
 samba_net="$samba4bindir/net"
 testparm="$samba4bindir/testparm"
 
-. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
 
 rm -rf $PREFIX/samba3-upgrade
 mkdir -p $PREFIX/samba3-upgrade
 cp -a $SRCDIR/testdata/samba3 $PREFIX/samba3-upgrade
 
 # Test 1 (s3 member)
-cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
 [global]
    workgroup = SAMBA
    security = user
@@ -39,11 +39,11 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb1.conf <<EOF
    debug level = 0
 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
+testit "samba3-upgrade-member" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb1.conf --targetdir=$PREFIX/samba3-upgrade/s4_1 --dbdir=$PREFIX/samba3-upgrade/samba3 --use-ntvfs
+testit "samba3-upgrade-member-getlocalsid" $samba_net getlocalsid s3upgrade --configfile=$PREFIX/samba3-upgrade/s4_1/etc/smb.conf
 
 # Test 2 (s3 dc)
-cat - > $PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb2.conf <<EOF
 [global]
    workgroup = SAMBA
    netbiosname = S3UPGRADE
@@ -63,15 +63,16 @@ EOF
 
 mv $PREFIX/samba3-upgrade/samba3/wins.dat2 $PREFIX/samba3-upgrade/samba3/wins.dat
 
-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
-testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_2/etc/smb.conf
+# Upgrade NT4-like domains in samba3upgrade
+testit "samba3-upgrade-dc" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_2 --dbdir=$PREFIX/samba3-upgrade/samba3 --use-ntvfs
+testit "samba3-upgrade-dc-getlocalsid" $samba_net getlocalsid samba --configfile=$PREFIX/samba3-upgrade/s4_2/etc/smb.conf
+testit "samba3-upgrade-dc-getdomainsid" $samba_net getdomainsid --configfile=$PREFIX/samba3-upgrade/s4_2/etc/smb.conf
 
 #Run final test without a wins.dat
 rm -f $PREFIX/samba3-upgrade/samba3/wins.dat
 
 # Test 3 (s3 dc using testparm hook)
-cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
+cat - >$PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
 [global]
    workgroup = SAMBA
    netbiosname = S3UPGRADE
@@ -89,9 +90,9 @@ cat - > $PREFIX/samba3-upgrade/samba3/smb3.conf <<EOF
    domain logons = yes
 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
-testit "samba3-upgrade-testparm-getdomainsid" $samba_net getdomainsid -s $PREFIX/samba3-upgrade/s4_3/etc/smb.conf
+testit "samba3-upgrade-testparm" $PYTHON $samba_tool domain classicupgrade $PREFIX/samba3-upgrade/samba3/smb2.conf --targetdir=$PREFIX/samba3-upgrade/s4_3 --testparm=$testparm --use-ntvfs
+testit "samba3-upgrade-testparm-getlocalsid" $samba_net getlocalsid samba --configfile=$PREFIX/samba3-upgrade/s4_3/etc/smb.conf
+testit "samba3-upgrade-testparm-getdomainsid" $samba_net getdomainsid --configfile=$PREFIX/samba3-upgrade/s4_3/etc/smb.conf
 
 rm -rf $PREFIX/samba3-upgrade