r21707: Finally merge my (long-living) perlselftest branch.

[ab/samba.git/.git] / source / script / tests / test_ldap.sh

diff --git a/source/script/tests/test_ldap.sh b/source/script/tests/test_ldap.sh
index 6d3182984561791a701ea294e9d7a390008f90f5..9b25ca2803bc37f391a3e45e7df61b837a617904 100755 (executable)
--- a/source/script/tests/test_ldap.sh
+++ b/source/script/tests/test_ldap.sh
@@ -1,28 +1,46 @@
 #!/bin/sh
 # test some simple LDAP and CLDAP operations
 
-if [ $# -lt 1 ]; then
+if [ $# -lt 3 ]; then
 cat <<EOF
-Usage: test_ldap.sh SERVER
+Usage: test_ldap.sh SERVER USERNAME PASSWORD
 EOF
 exit 1;
 fi
 
 SERVER="$1"
+USERNAME="$2"
+PASSWORD="$3"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
 
-testit "RootDSE" bin/ldbsearch -b "''" -H ldap://$SERVER -s base DUMMY=x dnsHostName highestCommittedUSN || failed=`expr $failed + 1`
-
-echo "Getting defaultNamingContext"
-BASEDN=`bin/ldbsearch -b '' -H ldap://$SERVER -s base DUMMY=x defaultNamingContext | grep ^defaultNamingContext | awk '{print $2}'`
-echo "BASEDN is $BASEDN"
-
+p=ldap
+for options in "" "--option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD --option=socket:testnonblock=true" "-U$USERNAME%$PASSWORD"; do
+    testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
+done
+# see if we support ldaps
+if grep ENABLE_GNUTLS.1 include/config.h > /dev/null; then
+    p=ldaps
+    for options in "" "-U$USERNAME%$PASSWORD"; do
+       testit "TESTING PROTOCOL $p with options $options" ../testprogs/blackbox/test_ldb.sh $p $SERVER $options
+    done
+fi
+for t in LDAP-CLDAP LDAP-BASIC LDAP-SCHEMA LDAP-UPTODATENESS
+do
+       testit "$t" bin/smbtorture $TORTURE_OPTIONS "-U$USERNAME%$PASSWORD" //$SERVER/_none_ $t
+done
 
-testit "Listing Users" bin/ldbsearch -H ldap://$SERVER -b "$BASEDN" '(objectclass=user)' sAMAccountName || failed=`expr $failed + 1`
+# only do the ldb tests when not in quick mode - they are quite slow, and ldb
+# is now pretty well tested by the rest of the quick tests anyway
+test "$TORTURE_QUICK" = "yes" || {
+   LDBDIR=lib/ldb
+   export LDBDIR
+   testit "ldb" $LDBDIR/tests/test-tdb.sh
+}
 
-testit "Listing Groups" bin/ldbsearch -H ldap://$SERVER -b "$BASEDN" '(objectclass=group)' sAMAccountName || failed=`expr $failed + 1`
+SCRIPTDIR=../testprogs/ejs
 
-testit "CLDAP" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ LDAP-CLDAP || failed=`expr $failed + 1`
+testit "ejs ldap" $SCRIPTDIR/ldap.js $CONFIGURATION $SERVER -U$USERNAME%$PASSWORD
 
+testok $0 $failed