From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Thu, 27 Jul 2023 17:20:57 +0000 (+0000)
Subject: ITS#10086 - Fix incorrect configurations in test
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52ee3e23a490913ecc77cdfe04735d7a6eef0a6e;p=thirdparty%2Fopenldap.git

ITS#10086 - Fix incorrect configurations in test

Fix test to be valid
---

diff --git a/tests/scripts/test059-consumer-config b/tests/scripts/test059-consumer-config
index 30e87e41a0..7f6d281f94 100755
--- a/tests/scripts/test059-consumer-config
+++ b/tests/scripts/test059-consumer-config
@@ -155,7 +155,7 @@ olcOverlay: syncprov
 dn: cn=config,cn=consumer
 changetype: add
 objectClass: olcGlobal
-cn: consumerconfig
+cn: config
 
 dn: olcDatabase={0}config,cn=config,cn=consumer
 changetype: add
@@ -303,11 +303,11 @@ cn: module
 olcModulePath: ../servers/slapd/back-$BACKEND
 olcModuleLoad: back_$BACKEND.la
 
-dn: cn=module,cn=config,cn=consumer
+dn: cn=module{0},cn=config,cn=consumer
 objectClass: olcModuleList
-cn: module
+cn: module{0}
 olcModulePath: ../servers/slapd/back-$BACKEND
-olcModuleLoad: back_$BACKEND.la
+olcModuleLoad: {0}back_$BACKEND.la
 EOF
 	RC=$?
 	if test $RC != 0 ; then
@@ -364,7 +364,14 @@ dn: olcDatabase={2}$BACKEND,cn=config
 changetype: modify
 add: olcDbIndex
 olcDbIndex: objectClass,entryUUID,entryCSN eq
-olcDbIndex: cn,uid pres,eq,sub
+olcDbIndex: cn,uid,sn pres,eq,sub
+
+dn: olcDatabase={1}$BACKEND,cn=config,cn=consumer
+changetype: modify
+add: olcDbIndex
+olcDbIndex: default eq
+olcDbIndex: objectClass,entryUUID,entryCSN eq
+olcDbIndex: cn,uid,sn pres,eq,sub
 EOF
 	RC=$?
 	if test $RC != 0 ; then
diff --git a/tests/scripts/test086-delta-consumer-config b/tests/scripts/test086-delta-consumer-config
index d89af3f0bb..7085aabf05 100755
--- a/tests/scripts/test086-delta-consumer-config
+++ b/tests/scripts/test086-delta-consumer-config
@@ -289,7 +289,7 @@ $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
 dn: cn=config,cn=consumer
 changetype: add
 objectClass: olcGlobal
-cn: consumerconfig
+cn: config
 
 dn: olcDatabase={0}config,cn=config,cn=consumer
 changetype: add
@@ -446,11 +446,11 @@ test $BACKEND = null && nullExclude="# " nullOK="OK"
 
 if [ "$BACKENDTYPE" = mod ]; then
 	$LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
-dn: cn=module,cn=config,cn=consumer
+dn: cn=module{0},cn=config,cn=consumer
 objectClass: olcModuleList
-cn: module
+cn: module{0}
 olcModulePath: ../servers/slapd/back-$BACKEND
-olcModuleLoad: back_$BACKEND.la
+olcModuleLoad: {0}back_$BACKEND.la
 EOF
 	RC=$?
 	if test $RC != 0 ; then
@@ -507,7 +507,14 @@ dn: olcDatabase={2}$BACKEND,cn=config
 changetype: modify
 add: olcDbIndex
 olcDbIndex: objectClass,entryUUID,entryCSN eq
-olcDbIndex: cn,uid pres,eq,sub
+olcDbIndex: cn,uid,sn pres,eq,sub
+
+dn: olcDatabase={1}$BACKEND,cn=config,cn=consumer
+changetype: modify
+add: olcDbIndex
+olcDbIndex: default eq
+olcDbIndex: objectClass,entryUUID,entryCSN eq
+olcDbIndex: cn,uid,sn pres,eq,sub
 EOF
 	RC=$?
 	if test $RC != 0 ; then