samba-tool user edit test: use testit instead of subunit_start_test, pass/failed

Signed-off-by: Björn Baumbach <bb@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

diff --git a/python/samba/tests/samba_tool/user_edit.sh b/python/samba/tests/samba_tool/user_edit.sh
index 66ae1d00721a4b55fbed353a64719fb86b07399e..166d45ae4d65d7699fcf72f3ddc4e5dd28203d02 100755 (executable)
--- a/python/samba/tests/samba_tool/user_edit.sh
+++ b/python/samba/tests/samba_tool/user_edit.sh
@@ -16,55 +16,40 @@ PASSWORD="$3"
 STpath=$(pwd)
 . $STpath/testprogs/blackbox/subunit.sh
 
-# create editor.sh
 tmpeditor=$(mktemp --suffix .sh -p $STpath/bin samba-tool-editor-XXXXXXXX)
+chmod +x $tmpeditor
+
+create_test_user() {
+       $PYTHON ${STpath}/source4/scripting/bin/samba-tool \
+               user create sambatool1 --random-password \
+               -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+}
 
-cat >$tmpeditor <<-'EOF'
+edit_user() {
+       # create editor.sh
+       cat >$tmpeditor <<-'EOF'
 #!/usr/bin/env bash
 user_ldif="$1"
 SED=$(which sed)
 $SED -i -e 's/userAccountControl: 512/userAccountControl: 514/' $user_ldif
 EOF
 
-chmod +x $tmpeditor
+       $PYTHON ${STpath}/source4/scripting/bin/samba-tool \
+       user edit sambatool1 --editor=$tmpeditor \
+       -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+}
 
-failed=0
+delete_user() {
+       $PYTHON ${STpath}/source4/scripting/bin/samba-tool \
+               user delete sambatool1 \
+               -H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD"
+}
 
-# Create a test user
-subunit_start_test "Create_User"
-output=$($PYTHON ${STpath}/source4/scripting/bin/samba-tool user create sambatool1 --random-password \
--H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD")
-status=$?
-if [ "x$status" = "x0" ]; then
-    subunit_pass_test "Create_User"
-else
-    echo "$output" | subunit_fail_test "Create_User"
-    failed=$((failed + 1))
-fi
-
-# Edit test user
-subunit_start_test "Edit_User"
-output=$($PYTHON ${STpath}/source4/scripting/bin/samba-tool user edit sambatool1 --editor=$tmpeditor \
--H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD")
-status=$?
-if [ "x$status" = "x0" ]; then
-    subunit_pass_test "Edit_User"
-else
-    echo "$output" | subunit_fail_test "Edit_User"
-    failed=$((failed + 1))
-fi
+failed=0
 
-# Delete test user
-subunit_start_test "Delete_User"
-output=$($PYTHON ${STpath}/source4/scripting/bin/samba-tool user delete sambatool1 \
--H "ldap://$SERVER" "-U$USERNAME" "--password=$PASSWORD")
-status=$?
-if [ "x$status" = "x0" ]; then
-    subunit_pass_test "Delete_User"
-else
-    echo "$output" | subunit_fail_test "Delete_User"
-    failed=$((failed + 1))
-fi
+testit "create_test_user" create_test_user || failed=`expr $failed + 1`
+testit "edit_user" edit_user || failed=`expr $failed + 1`
+testit "delete_user" delete_user || failed=`expr $failed + 1`
 
 rm -f $tmpeditor