summaryrefslogtreecommitdiff
path: root/source4/setup/tests
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-03-07 10:57:52 +1100
committerAndrew Bartlett <abartlet@samba.org>2008-03-07 10:57:52 +1100
commit14c5f968e1f99ceabc5a42d9a38a00ea137b00ea (patch)
treea922ad72242dd91f215d06b8a3f16d054800370b /source4/setup/tests
parent45149fbf9d3e55e17e21ab4a6159e9b805adc06d (diff)
downloadsamba-14c5f968e1f99ceabc5a42d9a38a00ea137b00ea.tar.gz
samba-14c5f968e1f99ceabc5a42d9a38a00ea137b00ea.tar.bz2
samba-14c5f968e1f99ceabc5a42d9a38a00ea137b00ea.zip
Rework provision scripts for more testing
This fixes up some issues with testdir (was not honoured) and increases test coverage. We now check all the major provision modes. In doing so, to make it possible to call from the multiple layers of 'sh', I have allowed 'dc' to alias 'domain controller' and 'member' to alias 'member server'. Fighting shell quoting in the test system was just too hard... Also fix upgrade.py Andrew Bartlett (This used to be commit 0923de12282b0e063dd73bc3e056dd5c3663c190)
Diffstat (limited to 'source4/setup/tests')
-rwxr-xr-xsource4/setup/tests/blackbox_provision.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/setup/tests/blackbox_provision.sh b/source4/setup/tests/blackbox_provision.sh
index 0aed7bb8b7..83c045e40d 100755
--- a/source4/setup/tests/blackbox_provision.sh
+++ b/source4/setup/tests/blackbox_provision.sh
@@ -27,7 +27,10 @@ testit() {
return $status
}
-testit "simple" $PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple
+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 --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
reprovision() {
$PYTHON ./setup/provision $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision"