upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-25 09:09:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

add monitor testing to concurrency tests data

Browse source
This commit is contained in:
Pierangelo Masarati 2008-07-19 14:28:41 +00:00
parent 99d135cc7a
commit b9930aef96
5 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tests/scripts/defines.sh
View file

@ -163,6 +163,8 @@ TOOLPROTO="-P 3"
LDIFFILTER=$SRCDIR/scripts/acfilter.sh
CONFFILTER=$SRCDIR/scripts/conf.sh
MONITORDATA=$SRCDIR/scripts/monitor_data.sh
SLAPADD="$TESTWD/../servers/slapd/slapd -Ta -d 0 $LDAP_VERBOSE"
SLAPCAT="$TESTWD/../servers/slapd/slapd -Tc -d 0 $LDAP_VERBOSE"
SLAPINDEX="$TESTWD/../servers/slapd/slapd -Ti -d 0 $LDAP_VERBOSE"

17
tests/scripts/monitor_data.sh
View file

@ -14,20 +14,20 @@
## <http://www.OpenLDAP.org/license.html>.
MONITORDB="$1"
DATADIR="$2"
TESTDIR="$3"
SRCDIR="$2"
DSTDIR="$3"
echo "MONITORDB $MONITORDB"
echo "DATADIR $DATADIR"
echo "TESTDIR $TESTDIR"
echo "SRCDIR $SRCDIR"
echo "DSTDIR $DSTDIR"
echo "pwd `pwd`"
# copy test data
cp "$DATADIR"/do_* "$TESTDIR"
cp "$SRCDIR"/do_* "$DSTDIR"
if test $MONITORDB != no ; then
# add back-monitor testing
cat >> "$TESTDIR/do_search.0" << EOF
# add back-monitor testing data
cat >> "$DSTDIR/do_search.0" << EOF
cn=Monitor
(objectClass=*)
cn=Monitor
@ -38,10 +38,11 @@ cn=Monitor
(objectClass=*)
EOF
cat >> "$TESTDIR/do_read.0" << EOF
cat >> "$DSTDIR/do_read.0" << EOF
cn=Backend 1,cn=Backends,cn=Monitor
cn=Entries,cn=Statistics,cn=Monitor
cn=Database 1,cn=Databases,cn=Monitor
EOF
fi

8
tests/scripts/test008-concurrency
View file

@ -54,9 +54,13 @@ for i in 0 1 2 3 4 5; do
sleep 5
done
# fix test data to include back-monitor, if available
# NOTE: copies do_* files from $DATADIR to $TESTDIR
$MONITORDATA "$MONITORDB" "$DATADIR" "$TESTDIR"
echo "Using tester for concurrent server access..."
time $SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
#$SLAPDTESTER -P "$PROGDIR" -d "$DATADIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l 50
time $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
#$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT1 -D "$MANAGERDN" -w $PASSWD -l $LOOPS
RC=$?
if test $RC != 0 ; then

6
tests/scripts/test036-meta-concurrency
View file

@ -189,8 +189,12 @@ for f in $TESTDIR/$DATADIR/do_bind.* ; do
echo "" >> $f
done
# fix test data to include back-monitor, if available
# NOTE: copies do_* files from $TESTDIR/$DATADIR to $TESTDIR
$MONITORDATA "$MONITORDB" "$TESTDIR/$DATADIR" "$TESTDIR"
echo "Using tester for concurrent server access..."
$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
-D "cn=Manager,$METABASEDN" -w $PASSWD -l $TESTLOOPS -r 20 -FF \
-i '!REFERRAL'
RC=$?

6
tests/scripts/test039-glue-ldap-concurrency
View file

@ -177,8 +177,12 @@ for f in $TESTDIR/$DATADIR/do_bind.* ; do
echo "" >> $f
done
# fix test data to include back-monitor, if available
# NOTE: copies do_* files from $TESTDIR/$DATADIR to $TESTDIR
$MONITORDATA "$MONITORDB" "$TESTDIR/$DATADIR" "$TESTDIR"
echo "Using tester for concurrent server access..."
$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 \
$SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR" -h $LOCALHOST -p $PORT3 \
-D "cn=Manager,$METABASEDN" -w $PASSWD \
-l $TESTLOOPS -L $TESTOLOOPS -r 20 -FF \
-i '!REFERRAL'