Happy New Year!

[openldap] / tests / scripts / test049-sync-config

diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index e2b79fef092ba7cc79600457d7b0cc787fdd4cc0..4ae524e66404ef477476688ca34498d3346d1d23 100755 (executable)
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2010 The OpenLDAP Foundation.
+## Copyright 1998-2016 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@ esac
 
 #
 # Test replication of dynamic config:
-# - start producer
+# - start provider
 # - start consumer
 # - configure over ldap
 # - populate over ldap
@@ -58,7 +58,7 @@ esac
 # - retrieve database over ldap and compare against expected results
 #
 
-echo "Starting producer slapd on TCP/IP port $PORT1..."
+echo "Starting provider slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $DYNAMICCONF > $CONFLDIF
 $SLAPADD -F $CFPRO -n 0 -l $CONFLDIF
 cd $PRODIR
@@ -73,7 +73,7 @@ cd $TESTWD
 
 sleep 1
 
-echo "Using ldapsearch to check that producer slapd is running..."
+echo "Using ldapsearch to check that provider slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "" -H $URI1 \
                'objectclass=*' > /dev/null 2>&1
@@ -91,13 +91,13 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Inserting syncprov overlay on producer..."
+echo "Inserting syncprov overlay on provider..."
 if [ "$SYNCPROV" = syncprovmod ]; then
        $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF > $TESTOUT 2>&1
 dn: cn=module,cn=config
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/overlays
+olcModulePath: $TESTWD/../servers/slapd/overlays
 olcModuleLoad: syncprov.la
 EOF
        RC=$?
@@ -200,7 +200,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Adding schema and databases on producer..."
+echo "Adding schema and databases on provider..."
 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 include: file://$ABS_SCHEMADIR/core.ldif
 
@@ -219,12 +219,15 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
+nullExclude="" nullOK=""
+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
 objectClass: olcModuleList
 cn: module
-olcModulePath: ../../../servers/slapd/back-$BACKEND
+olcModulePath: $TESTWD/../servers/slapd/back-$BACKEND
 olcModuleLoad: back_$BACKEND.la
 EOF
        RC=$?
@@ -238,10 +241,10 @@ fi
 $LDAPADD -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={1}$BACKEND,cn=config
 objectClass: olcDatabaseConfig
-objectClass: olc${BACKEND}Config
+${nullExclude}objectClass: olc${BACKEND}Config
 olcDatabase: {1}$BACKEND
 olcSuffix: $BASEDN
-olcDbDirectory: ./db
+${nullExclude}olcDbDirectory: ./db
 olcRootDN: $MANAGERDN
 olcRootPW: $PASSWD
 olcSyncRepl: rid=002 provider=$URI1 binddn="$MANAGERDN" bindmethod=simple
@@ -262,8 +265,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-case $BACKEND in
-bdb | hdb)
+if test $INDEXDB = indexdb ; then
        $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >>$TESTOUT 2>&1
 dn: olcDatabase={1}$BACKEND,cn=config
 changetype: modify
@@ -277,10 +279,9 @@ EOF
                test $KILLSERVERS != no && kill -HUP $KILLPIDS
                exit $RC
        fi
-       ;;
-esac
+fi
 
-echo "Using ldapadd to populate producer..."
+echo "Using ldapadd to populate provider..."
 $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $LDIFORDERED \
        >> $TESTOUT 2>&1
 RC=$?
@@ -299,7 +300,7 @@ for i in 0 1 2 3 4 5; do
        RESULT=`$LDAPSEARCH -H $URI2 \
                -s base -b "cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com" \
                '(objectClass=*)' 2>&1 | awk '/^dn:/ {print "OK"}'`
-       if test "x$RESULT" = "xOK" ; then
+       if test "x$RESULT$nullOK" = "xOK" ; then
                RC=0
                break
        fi
@@ -313,7 +314,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Replacing olcSyncrepl on producer..."
+echo "Replacing olcSyncrepl on provider..."
 $LDAPMODIFY -D cn=config -H $URI1 -y $CONFIGPWF <<EOF >> $TESTOUT 2>&1
 dn: olcDatabase={0}config,cn=config
 changetype: modify
@@ -325,13 +326,13 @@ EOF
 echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
 sleep $SLEEP1
 
-echo "Using ldapsearch to read config from the producer..."
+echo "Using ldapsearch to read config from the provider..."
 $LDAPSEARCH -b cn=config -D cn=config -H $URI1 -y $CONFIGPWF  \
        'objectclass=*' > $MASTEROUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at producer ($RC)!"
+       echo "ldapsearch failed at provider ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
@@ -347,27 +348,27 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Filtering producer results..."
-. $LDIFFILTER < $MASTEROUT > $MASTERFLT
+echo "Filtering provider results..."
+$LDIFFILTER < $MASTEROUT > $MASTERFLT
 echo "Filtering consumer results..."
-. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
+$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
 
-echo "Comparing retrieved configs from producer and consumer..."
+echo "Comparing retrieved configs from provider and consumer..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - producer and consumer configs differ"
+       echo "test failed - provider and consumer configs differ"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit 1
 fi
 
-echo "Using ldapsearch to read all the entries from the producer..."
+echo "Using ldapsearch to read all the entries from the provider..."
 $LDAPSEARCH -S "" -b "$BASEDN" -D "$MANAGERDN" -H $URI1 -w $PASSWD  \
        'objectclass=*' > $MASTEROUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at producer ($RC)!"
+       echo "ldapsearch failed at provider ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
@@ -385,16 +386,16 @@ fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
-echo "Filtering producer results..."
-. $LDIFFILTER < $MASTEROUT > $MASTERFLT
+echo "Filtering provider results..."
+$LDIFFILTER < $MASTEROUT > $MASTERFLT
 echo "Filtering consumer results..."
-. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
+$LDIFFILTER < $SLAVEOUT > $SLAVEFLT
 
-echo "Comparing retrieved entries from producer and consumer..."
+echo "Comparing retrieved entries from provider and consumer..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - producer and consumer databases differ"
+       echo "test failed - provider and consumer databases differ"
        exit 1
 fi