ITS#5189

[openldap] / tests / scripts / test017-syncreplication-refresh

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index eff66046b2b7a35056fb1db083382eb60b484d47..2e788df6e12240af267bf02aa5ddc19fe9eddd53 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -25,14 +25,15 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR2
 
 #
 # Test replication:
-# - start master
-# - start slave
+# - start producer
+# - start consumer
 # - populate over ldap
 # - perform some modifies and deleted
+# - attempt to modify the consumer (referral)
 # - retrieve database over ldap and compare against expected results
 #
 
-echo "Starting master slapd on TCP/IP port $PORT1..."
+echo "Starting producer slapd on TCP/IP port $PORT1..."
 . $CONFFILTER $BACKEND $MONITORDB < $SRMASTERCONF > $CONF1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 &
 PID=$!
@@ -42,7 +43,9 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID"
 
-echo "Using ldapsearch to check that master slapd is running..."
+sleep 1
+
+echo "Using ldapsearch to check that producer slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
                'objectclass=*' > /dev/null 2>&1
@@ -60,7 +63,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Using ldapadd to create the context prefix entry in the master..."
+echo "Using ldapadd to create the context prefix entry in the producer..."
 $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
        $LDIFORDEREDCP > /dev/null 2>&1
 RC=$?
@@ -70,7 +73,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Starting slave slapd on TCP/IP port $PORT2..."
+echo "Starting consumer slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND $MONITORDB < $R1SRSLAVECONF > $CONF2
 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 &
 SLAVEPID=$!
@@ -80,7 +83,9 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$KILLPIDS $SLAVEPID"
 
-echo "Using ldapsearch to check that slave slapd is running..."
+sleep 1
+
+echo "Using ldapsearch to check that consumer slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
                'objectclass=*' > /dev/null 2>&1
@@ -98,7 +103,7 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Using ldapadd to populate the master directory..."
+echo "Using ldapadd to populate the producer directory..."
 $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
        $LDIFORDEREDNOCP > /dev/null 2>&1
 RC=$?
@@ -111,7 +116,7 @@ fi
 echo "Waiting 15 seconds for syncrepl to receive changes..."
 sleep 15
 
-echo "Using ldapmodify to modify master directory..."
+echo "Using ldapmodify to modify producer directory..."
 
 #
 # Do some modifications
@@ -200,13 +205,14 @@ fi
 echo "Waiting 15 seconds for syncrepl to receive changes..."
 sleep 15
 
-echo "Try updating the slave..."
+echo "Try updating the consumer slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \
        $TESTOUT 2>&1 << EOMODS
 dn: cn=James A Jones 1, ou=Alumni Association, ou=People, dc=example, dc=com
 changetype: modify
 add: description
-description: this write must fail because directed to a shadow context
+description: This write must fail because directed to a shadow context,
+description: unless the chain overlay is configured appropriately ;)
 
 EOMODS
 
@@ -214,47 +220,52 @@ RC=$?
 
 # expect 10 (LDAP_REFERRAL)...
 if test $RC != 10 ; then
-       echo "ldapmodify should have failed ($RC)!"
+       echo "ldapmodify should have returned referral ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
 
-echo "Using ldapsearch to read all the entries from the master..."
+OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"
+
+echo "Using ldapsearch to read all the entries from the producer..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-       'objectclass=*' > $MASTEROUT 2>&1
+       '(objectclass=*)' '*' $OPATTRS > $MASTEROUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at master ($RC)!"
+       echo "ldapsearch failed at producer ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
 
-echo "Using ldapsearch to read all the entries from the slave..."
+echo "Using ldapsearch to read all the entries from the consumer..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
-       'objectclass=*' > $SLAVEOUT 2>&1
+       '(objectclass=*)' '*' $OPATTRS > $SLAVEOUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
-       echo "ldapsearch failed at slave ($RC)!"
+       echo "ldapsearch failed at consumer ($RC)!"
        test $KILLSERVERS != no && kill -HUP $KILLPIDS
        exit $RC
 fi
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 
-echo "Filtering master results..."
+echo "Filtering producer results..."
 . $LDIFFILTER < $MASTEROUT > $MASTERFLT
-echo "Filtering slave results..."
+echo "Filtering consumer results..."
 . $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
 
-echo "Comparing retrieved entries from master and slave..."
+echo "Comparing retrieved entries from producer and consumer..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - master and slave databases differ"
+       echo "test failed - producer and consumer databases differ"
        exit 1
 fi
 
 echo ">>>>> Test succeeded"
+
+test $KILLSERVERS != no && wait
+
 exit 0