summaryrefslogtreecommitdiff
path: root/source4/setup
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-30 14:36:24 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-30 14:36:24 +1000
commitb34bc408e741919b893a325616de432e8a630e10 (patch)
treebd09ca6b6ca663b67eca4e88c4c18e16193ee5ab /source4/setup
parentb9babfe4cc70b96f4f1df037244cd27eae580c94 (diff)
downloadsamba-b34bc408e741919b893a325616de432e8a630e10.tar.gz
samba-b34bc408e741919b893a325616de432e8a630e10.tar.bz2
samba-b34bc408e741919b893a325616de432e8a630e10.zip
Don't pass an smb.conf to provision tests.
These tests will create their own smb.conf in their prefix anyway. Andrew Bartlett (This used to be commit c0322e8e27d67655b7498b27df0829aa5682a345)
Diffstat (limited to 'source4/setup')
-rwxr-xr-xsource4/setup/tests/blackbox_newuser.sh9
-rwxr-xr-xsource4/setup/tests/blackbox_provision.sh23
-rwxr-xr-xsource4/setup/tests/blackbox_setpassword.sh9
3 files changed, 19 insertions, 22 deletions
diff --git a/source4/setup/tests/blackbox_newuser.sh b/source4/setup/tests/blackbox_newuser.sh
index fed5f7d263..3e534f2b52 100755
--- a/source4/setup/tests/blackbox_newuser.sh
+++ b/source4/setup/tests/blackbox_newuser.sh
@@ -1,20 +1,19 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_newuser.sh PREFIX CONFIGURATION
+Usage: blackbox_newuser.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
testit "newuser" $PYTHON ./setup/newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass
diff --git a/source4/setup/tests/blackbox_provision.sh b/source4/setup/tests/blackbox_provision.sh
index 2afa9dc952..1a915aff79 100755
--- a/source4/setup/tests/blackbox_provision.sh
+++ b/source4/setup/tests/blackbox_provision.sh
@@ -1,28 +1,27 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_provision.sh PREFIX CONFIGURATION
+Usage: blackbox_provision.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-default" $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
-testit "simple-member" $PYTHON ./setup/provision $CONFIGURATION --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member
-testit "simple-standalone" $PYTHON ./setup/provision $CONFIGURATION --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone
-testit "blank-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/blank-dc --blank
-testit "partitions-only-dc" $PYTHON ./setup/provision $CONFIGURATION --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
+testit "simple-default" $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-default
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-member" $PYTHON ./setup/provision --server-role="member" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-member
+testit "simple-standalone" $PYTHON ./setup/provision --server-role="standalone" --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple-standalone
+testit "blank-dc" $PYTHON ./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
+testit "partitions-only-dc" $PYTHON ./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
reprovision() {
- $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
- $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
+ $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
+ $PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"
}
testit "reprovision" reprovision
diff --git a/source4/setup/tests/blackbox_setpassword.sh b/source4/setup/tests/blackbox_setpassword.sh
index 725466150c..89f1aa5858 100755
--- a/source4/setup/tests/blackbox_setpassword.sh
+++ b/source4/setup/tests/blackbox_setpassword.sh
@@ -1,19 +1,18 @@
#!/bin/sh
-if [ $# -lt 2 ]; then
+if [ $# -lt 1 ]; then
cat <<EOF
-Usage: blackbox_setpassword.sh PREFIX CONFIGURATION
+Usage: blackbox_setpassword.sh PREFIX
EOF
exit 1;
fi
PREFIX="$1"
-CONFIGURATION="$2"
-shift 2
+shift 1
. `dirname $0`/../../../testprogs/blackbox/subunit.sh
-testit "simple-dc" $PYTHON ./setup/provision $CONFIGURATION --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
+testit "simple-dc" $PYTHON ./setup/provision --server-role="dc" --domain=FOO --realm=foo.example.com --domain-sid=S-1-5-21-4177067393-1453636373-93818738 --targetdir=$PREFIX/simple-dc
testit "newuser" $PYTHON ./setup/newuser --configfile=$PREFIX/simple-dc/etc/smb.conf testuser testpass