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 30e87e41a0af7b63f6e3da1d0d56cb15b74f3cbe..7f6d281f9436615d23c3f0c2848eacfcb4d681c5 100755 (executable)
--- 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 d89af3f0bb71ce227ecdb9ad3e03f8a545f675cd..7085aabf054c73ebedad8e7e820ce788f7eca078 100755 (executable)
--- 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