From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Mon, 13 May 2019 19:41:36 +0000 (+0000)
Subject: ITS#9010 - Fix test suite
X-Git-Tag: OPENLDAP_REL_ENG_2_5_0ALPHA~67^2~66
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=262a074303de89e0ea025e9fc4c3f91c738e3bc6;p=thirdparty%2Fopenldap.git

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 26e9ce9ecb..20209d1298 100644
--- 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 575097c0f6..188bf38359 100755
--- 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 b4cf60da70..1c59fbde95 100755
--- 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"