Update test suite

diff --git a/tests/data/lloadd.conf b/tests/data/lloadd.conf
index 6112e3a214ece9fd01b2f789c97b85e69c4d2ae4..890f420de2ce9968c2cf40f8e17a7ea62f3655fe 100644 (file)
--- a/tests/data/lloadd.conf
+++ b/tests/data/lloadd.conf
@@ -26,21 +26,21 @@ bindconf
 
 backend uri=@URI2@
     numconns=3
-    bindconns=2
+    bindconns=3
     retry=5000
-    max-pending-ops=5
+    max-pending-ops=20
     conn-max-pending=3
 
 backend uri=@URI3@
     numconns=3
-    bindconns=2
+    bindconns=3
     retry=5000
-    max-pending-ops=5
+    max-pending-ops=20
     conn-max-pending=3
 
 backend uri=@URI4@
     numconns=3
-    bindconns=2
+    bindconns=3
     retry=5000
-    max-pending-ops=5
+    max-pending-ops=20
     conn-max-pending=3

diff --git a/tests/scripts/lloadd/test002-load b/tests/scripts/lloadd/test002-load
index b4594afe99d20924c40e66ee2ed93ebb20c09829..1ecd913266cc510f11144b1cdf2aba2ce9ac5a8b 100755 (executable)
--- a/tests/scripts/lloadd/test002-load
+++ b/tests/scripts/lloadd/test002-load
@@ -20,6 +20,10 @@ if test x$TESTLOOPS = x ; then
     TESTLOOPS=50
 fi
 
+if test x$TESTCHILDREN = x ; then
+    TESTCHILDREN=20
+fi
+
 if test x$MAXRETRIES = x ; then
     MAXRETRIES=5
 fi
@@ -140,45 +144,20 @@ fi
 $MONITORDATA "$DATADIR" "$TESTDIR"
 
 
-echo "Using tester for concurrent server access..."
-# FIXME: Phase 1 only - we send 'Unwilling to perform' for some request types
+echo "Using tester for concurrent server access ($TESTCHILDREN x $TESTLOOPS ops)..."
 $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" \
     -H $URI1 -D "$MANAGERDN" -w $PASSWD \
-    -l $TESTLOOPS -r $MAXRETRIES \
-    -i '*INVALID_CREDENTIALS' -i '*UNAVAILABLE' \
-    -i 'UNWILLING_TO_PERFORM'
-RC=$?
-
-if test $RC != 0 ; then
-    echo "slapd-tester failed ($RC)!"
-    test $KILLSERVERS != no && kill -HUP $KILLPIDS
-    exit $RC
-fi
-
-echo "Using ldapsearch to retrieve all the entries..."
-$LDAPSEARCH -S "" -b "$BASEDN" -H $URI1 \
-    'objectClass=*' > $SEARCHOUT 2>&1
+    -t 1 -l $TESTLOOPS -r $MAXRETRIES -j $TESTCHILDREN \
+    -i '*INVALID_CREDENTIALS,*BUSY,UNWILLING_TO_PERFORM'
 RC=$?
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
 if test $RC != 0 ; then
-    echo "ldapsearch failed ($RC)!"
+    echo "slapd-tester failed ($RC)!"
     exit $RC
 fi
 
-echo "Filtering ldapsearch results..."
-$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
-echo "Filtering original ldif used to create database..."
-$LDIFFILTER < $LDIF > $LDIFFLT
-echo "Comparing filter output..."
-$CMP $SEARCHFLT $LDIFFLT > $CMPOUT
-
-if test $? != 0 ; then
-    echo "comparison failed - database was not created correctly"
-    exit 1
-fi
-
 echo ">>>>> Test succeeded"
 
 test $KILLSERVERS != no && wait