[PATCH 4/8] s4:selftest Add tests for upgradeprovision

[Andrew Bartlett]

---
 source4/selftest/tests.sh                        |    1 +
 source4/setup/tests/blackbox_upgradeprovision.sh |   26 ++++++++++++++++++++++
 2 files changed, 27 insertions(+), 0 deletions(-)
 create mode 100755 source4/setup/tests/blackbox_upgradeprovision.sh

diff --git a/source4/selftest/tests.sh b/source4/selftest/tests.sh
index 8888637..724c9f2 100755
--- a/source4/selftest/tests.sh
+++ b/source4/selftest/tests.sh
@@ -470,5 +470,6 @@ rm -rf $PREFIX/provision
 mkdir $PREFIX/provision
 plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision"
 plantest "blackbox.provision-backend.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision-backend.sh "$PREFIX/provision"
+plantest "blackbox.upgradeprovision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_upgradeprovision.sh "$PREFIX/provision"
 plantest "blackbox.setpassword.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_setpassword.sh "$PREFIX/provision"
 plantest "blackbox.newuser.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_newuser.sh "$PREFIX/provision" 
diff --git a/source4/setup/tests/blackbox_upgradeprovision.sh b/source4/setup/tests/blackbox_upgradeprovision.sh
new file mode 100755
index 0000000..e5176e6
--- /dev/null
+++ b/source4/setup/tests/blackbox_upgradeprovision.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+if [ $# -lt 1 ]; then
+cat <<EOF
+Usage: blackbox_upgradeprovision.sh PREFIX
+EOF
+exit 1;
+fi
+
+PREFIX="$1"
+shift 1
+
+. `dirname $0`/../../../testprogs/blackbox/subunit.sh
+
+upgradeprovision() {
+	$PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision" --server-role="dc"
+	$PYTHON ./scripting/bin/upgradeprovision --targetdir="$PREFIX/upgradeprovision"
+}
+
+upgradeprovision_full() {
+	$PYTHON ./setup/provision --domain=FOO --realm=foo.example.com --targetdir="$PREFIX/upgradeprovision_full" --server-role="dc"
+	$PYTHON ./scripting/bin/upgradeprovision --targetdir="$PREFIX/upgradeprovision_full" --full
+}
+
+testit "upgradeprovision" upgradeprovision
+testit "upgradeprovision_full" upgradeprovision_full
-- 
1.6.3.3


--------------040904030402080707020200
Content-Type: text/x-patch;
 name="0008-s4-fix-problems.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="0008-s4-fix-problems.patch"