ITS#9010 - Fix test suite

Some additional fixes for the testsuite now that back-bdb/hdb are no
longer present.

diff --git a/tests/data/monitor2.out b/tests/data/monitor2.out
index 26e9ce9ecb3444c5cc9d4c426e1cb51927b3867e..20209d1298a5011440b93e8f0b2ec420eca2cba8 100644 (file)
--- a/tests/data/monitor2.out
+++ b/tests/data/monitor2.out
@@ -10,9 +10,6 @@ structuralObjectClass: monitoredObject
 monitorIsShadow: FALSE
 namingContexts: o=OpenLDAP Project,l=Internet
 readOnly: FALSE
-olmBDBEntryCache: 0
-olmBDBDNCache: 0
-olmBDBIDLCache: 0
 entryDN: cn=Database 1,cn=Databases,cn=Monitor
 
 dn: cn=Database 2,cn=Databases,cn=Monitor

diff --git a/tests/scripts/test052-memberof b/tests/scripts/test052-memberof
index 575097c0f6d5239e145a06144b925ff083953adf..188bf38359912d54d8ec25f7bc5e09baad921573 100755 (executable)
--- a/tests/scripts/test052-memberof
+++ b/tests/scripts/test052-memberof
@@ -72,7 +72,7 @@ EOF
        fi
 fi
 
-indexInclude="" mainInclude="" " nullExclude=""
+indexInclude="" mainInclude="" nullExclude=""
 test $INDEXDB = indexdb        || indexInclude="# "
 test $MAINDB  = maindb || mainInclude="# "
 case $BACKEND in

diff --git a/tests/scripts/test056-monitor b/tests/scripts/test056-monitor
index b4cf60da70dd02ae176b49bd157ad673932a4006..1c59fbde959ba54d75246c9f84001821f99192aa 100755 (executable)
--- a/tests/scripts/test056-monitor
+++ b/tests/scripts/test056-monitor
@@ -85,7 +85,7 @@ echo "Using ldapsearch to read database monitor entries..."
 $LDAPSEARCH -S "" -b "$DATABASESMONITORDN" -h $LOCALHOST -p $PORT1 \
        'objectclass=*' \
        structuralObjectClass entryDN namingContexts readOnly \
-       monitorIsShadow monitorContext
+       monitorIsShadow monitorContext \
        > $SEARCHOUT 2>&1
 RC=$?
 
@@ -98,15 +98,8 @@ fi
 echo "Filtering ldapsearch results..."
 $LDIFFILTER -b monitor < $SEARCHOUT > $SEARCHFLT
 
-TMPMONITOROUT2=$MONITOROUT2
-case $BACKEND in
-*)
-       TMPMONITOROUT2=$TESTDIR/monitor2.out
-       ;;
-esac
-
 echo "Comparing filter output..."
-$CMP $SEARCHFLT $TMPMONITOROUT2 > $CMPOUT
+$CMP $SEARCHFLT $MONITOROUT2 > $CMPOUT
 
 if test $? != 0 ; then
         echo "comparison failed - database monitor output is not correct"