diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-12 01:39:31 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-12 01:39:31 +0100 |
| commit | 0f4c940919de6203595b8eaeb12eb9c2ea887f8c (patch) | |
| tree | 10fd97fc241cbb806d41d9fd74b316ea84602a36 | |
| parent | 1529331b97cc67869f07c2cfa8c73616f3247b73 (diff) | |
| download | samba-0f4c940919de6203595b8eaeb12eb9c2ea887f8c.tar.gz samba-0f4c940919de6203595b8eaeb12eb9c2ea887f8c.tar.bz2 samba-0f4c940919de6203595b8eaeb12eb9c2ea887f8c.zip | |
Add blackbox test for provisioning code to make sure it can be run more than once in a row.
(This used to be commit 42466d960c86b692ef5e03c045ba24591c5c6f84)
| -rwxr-xr-x | source4/selftest/samba4_tests.sh | 2 | ||||
| -rwxr-xr-x | source4/setup/tests/blackbox_provision.sh | 39 |
2 files changed, 40 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh index fba9e8603e..f2895304cf 100755 --- a/source4/selftest/samba4_tests.sh +++ b/source4/selftest/samba4_tests.sh @@ -327,5 +327,5 @@ then rm -rf $PREFIX/upgrade plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf rm -rf $PREFIX/provision - plantest "blackbox.provision.py" none $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/provision + plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX" "$CONFIGURATION" fi diff --git a/source4/setup/tests/blackbox_provision.sh b/source4/setup/tests/blackbox_provision.sh new file mode 100755 index 0000000000..57b11eae5f --- /dev/null +++ b/source4/setup/tests/blackbox_provision.sh @@ -0,0 +1,39 @@ +#!/bin/sh + +if [ $# -lt 2 ]; then +cat <<EOF +Usage: blackbox_provision.sh PREFIX CONFIGURATION +EOF +exit 1; +fi + +PREFIX="$1" +CONFIGURATION="$2" +shift 2 + +testit() { + name="$1" + shift + cmdline="$*" + echo "test: $name" + $cmdline + status=$? + if [ x$status = x0 ]; then + echo "success: $name" + else + echo "failure: $name" + failed=`expr $failed + 1` + fi + return $status +} + +testit "simple" $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/simple + +reprovision() { + $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" + $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/reprovision" +} + +testit "reprovision" reprovision + +exit $failed |