From fdd2a7e65f638eac91471c5428aef4ae8b2f2fb3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 10 Sep 2012 14:47:21 +0200 Subject: [PATCH] s4:setup/tests: make use of samba-tool domain provision metze --- source4/setup/tests/blackbox_group.sh | 2 +- source4/setup/tests/blackbox_newuser.sh | 2 +- source4/setup/tests/blackbox_provision-backend.sh | 52 +++++------ source4/setup/tests/blackbox_provision.sh | 106 +++++++++++----------- source4/setup/tests/blackbox_setpassword.sh | 2 +- source4/setup/tests/blackbox_upgradeprovision.sh | 4 +- 6 files changed, 84 insertions(+), 84 deletions(-) rewrite source4/setup/tests/blackbox_provision-backend.sh (75%) rewrite source4/setup/tests/blackbox_provision.sh (64%) diff --git a/source4/setup/tests/blackbox_group.sh b/source4/setup/tests/blackbox_group.sh index e03a7807c20..f5569c390de 100755 --- a/source4/setup/tests/blackbox_group.sh +++ b/source4/setup/tests/blackbox_group.sh @@ -14,7 +14,7 @@ shift 1 rm -rf $PREFIX/simple-dc -testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs +testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs samba_tool="./bin/samba-tool" CONFIG="--configfile=$PREFIX/simple-dc/etc/smb.conf" diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh index 8c9e09015f1..9c11cd6ec30 100755 --- a/source4/setup/tests/blackbox_newuser.sh +++ b/source4/setup/tests/blackbox_newuser.sh @@ -14,7 +14,7 @@ shift 1 rm -rf $PREFIX/simple-dc -testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs +testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs samba_tool="./bin/samba-tool" CONFIG="--configfile=$PREFIX/simple-dc/etc/smb.conf" diff --git a/source4/setup/tests/blackbox_provision-backend.sh b/source4/setup/tests/blackbox_provision-backend.sh dissimilarity index 75% index f96afd705f7..a65e7fcd953 100755 --- a/source4/setup/tests/blackbox_provision-backend.sh +++ b/source4/setup/tests/blackbox_provision-backend.sh @@ -1,26 +1,26 @@ -#!/bin/sh - -if [ $# -lt 1 ]; then -cat < $PREFIX/simple-dc/etc/smb.conf -testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs -#The rest of these tests are with no smb.conf file present - -rm -rf $PREFIX/simple-dc -testit "simple-dc-guids" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --domain-guid=6054d36d-2bfd-44f1-a9cd-32cfbb06480b --ntds-guid=b838f255-c8aa-4fe8-9402-b7d61ca3bd1b --invocationid=6d4cff9a-2bbf-4b4c-98a2-36242ddb0bd6 --targetdir=$PREFIX/simple-dc --use-ntvfs -rm -rf $PREFIX/simple-member -testit "simple-member" $PYTHON $SRCDIR/source4/setup/provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member --use-ntvfs -rm -rf $PREFIX/simple-standalone -testit "simple-standalone" $PYTHON $SRCDIR/source4/setup/provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone --use-ntvfs -rm -rf $PREFIX/blank-dc -testit "blank-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank --use-ntvfs -rm -rf $PREFIX/partitions-only-dc -testit "partitions-only-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only --use-ntvfs - -reprovision() { - rm -rf $PREFIX/reprovision - $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs - $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs -} - -testit "reprovision" reprovision -rm -rf $PREFIX/simple-default -rm -rf $PREFIX/simple-dc -rm -rf $PREFIX/blank-dc -rm -rf $PREFIX/simple-member -rm -rf $PREFIX/simple-standalone -rm -rf $PREFIX/partitions-only-dc -rm -rf $PREFIX/reprovision - -exit $failed +#!/bin/sh + +if [ $# -lt 1 ]; then +cat < $PREFIX/simple-dc/etc/smb.conf +testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs +#The rest of these tests are with no smb.conf file present + +rm -rf $PREFIX/simple-dc +testit "simple-dc-guids" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --domain-guid=6054d36d-2bfd-44f1-a9cd-32cfbb06480b --ntds-guid=b838f255-c8aa-4fe8-9402-b7d61ca3bd1b --invocationid=6d4cff9a-2bbf-4b4c-98a2-36242ddb0bd6 --targetdir=$PREFIX/simple-dc --use-ntvfs +rm -rf $PREFIX/simple-member +testit "simple-member" $PYTHON $BINDIR/samba-tool domain provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member --use-ntvfs +rm -rf $PREFIX/simple-standalone +testit "simple-standalone" $PYTHON $BINDIR/samba-tool domain provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone --use-ntvfs +rm -rf $PREFIX/blank-dc +testit "blank-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank --use-ntvfs +rm -rf $PREFIX/partitions-only-dc +testit "partitions-only-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/partitions-only-dc --partitions-only --use-ntvfs + +reprovision() { + rm -rf $PREFIX/reprovision + $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs + $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" --use-ntvfs +} + +testit "reprovision" reprovision +rm -rf $PREFIX/simple-default +rm -rf $PREFIX/simple-dc +rm -rf $PREFIX/blank-dc +rm -rf $PREFIX/simple-member +rm -rf $PREFIX/simple-standalone +rm -rf $PREFIX/partitions-only-dc +rm -rf $PREFIX/reprovision + +exit $failed diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh index 65027748740..17447474c02 100755 --- a/source4/setup/tests/blackbox_setpassword.sh +++ b/source4/setup/tests/blackbox_setpassword.sh @@ -15,7 +15,7 @@ shift 1 samba_tool="./bin/samba-tool" rm -rf $PREFIX/simple-dc -testit "simple-dc" $PYTHON $SRCDIR/source4/setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs +testit "simple-dc" $PYTHON $BINDIR/samba-tool domain provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc --use-ntvfs testit "user add" $samba_tool user create --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testp@ssw0Rd diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh index b218fe4d9cb..3df47e70c19 100755 --- a/source4/setup/tests/blackbox_upgradeprovision.sh +++ b/source4/setup/tests/blackbox_upgradeprovision.sh @@ -18,7 +18,7 @@ upgradeprovision() { if [ -d $PREFIX/upgradeprovision ]; then rm -fr $PREFIX/upgradeprovision fi - $PYTHON $SRCDIR/source4/setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs + $PYTHON $BINDIR/samba-tool domain provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc" --use-ntvfs $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision/etc/smb.conf" --debugchange } @@ -26,7 +26,7 @@ upgradeprovision_full() { if [ -d $PREFIX/upgradeprovision_full ]; then rm -fr $PREFIX/upgradeprovision_full fi - $PYTHON $SRCDIR/source4/setup/provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs + $PYTHON $BINDIR/samba-tool domain provision --host-name=bar --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc" --use-ntvfs $PYTHON $SRCDIR/source4/scripting/bin/upgradeprovision -s "$PREFIX/upgradeprovision_full/etc/smb.conf" --full --debugchange } -- 2.11.4.GIT