another try at fixing test011

[openldap] / tests / scripts / test011-subtree-repl

diff --git a/tests/scripts/test011-subtree-repl b/tests/scripts/test011-subtree-repl
index ed1a9c10a4669a67335964914fb4ef296be3f07c..994d38aa7937fd3f71002173acc2b1484094f37c 100755 (executable)
--- a/tests/scripts/test011-subtree-repl
+++ b/tests/scripts/test011-subtree-repl
@@ -43,7 +43,7 @@ fi
 
 # quick hack to check for awk
 echo "looking for a POSIX compliant awk"
-awk -W version >/dev/null 2>&1
+awk -W version >$CMPOUT 2>&1
 if test $? != 0 ; then
        echo "This test requires awk"
        exit 0
@@ -64,7 +64,7 @@ if test $WAIT != 0 ; then
     read foo
 fi
 
-echo "Starting slave slapd on TCP/IP port $SLAVEPORT..."
+echo "Starting sub-slave slapd on TCP/IP port $SLAVEPORT..."
 . $CONFFILTER $BACKEND $MONITORDB < $SUBSLAVECONF > $REPLCONF
 $SLAPD -f $REPLCONF -h $SLAVEURI -d $LVL $TIMING > $SLAVELOG 2>&1 &
 SLAVEPID=$!
@@ -85,7 +85,7 @@ for i in 0 1 2 3 4 5; do
        sleep 5
 done
 
-echo "Using ldapsearch to check that slave slapd is running..."
+echo "Using ldapsearch to check that sub-slave slapd is running..."
 for i in 0 1 2 3 4 5; do
        $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT \
                'objectclass=*' > /dev/null 2>&1
@@ -107,7 +107,7 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT -w $PASSWD < \
 RC=$?
 if test $RC != 0 ; then
        echo "ldapadd failed ($RC)!"
-       kill -INT $PID $SLAVEPID
+       kill -HUP $PID $SLAVEPID
        kill -KILL $SLURPPID
        exit $RC
 fi
@@ -127,6 +127,12 @@ dn: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michig
 changetype: modify
 add: drink
 drink: Orange Juice
+-
+delete: sn
+sn: Jones
+-
+add: sn
+sn: Jones
 
 dn: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US
 changetype: modify
@@ -149,7 +155,11 @@ description: A very long description, that is very likely to cause line wrapping
 
 dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US
 changetype: modify
-delete: member
+replace: member
+member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,o=University of Michi
+gan,c=US
+-
+delete: description
 
 dn: cn=Gern Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US
 changetype: add
@@ -200,7 +210,7 @@ RC=$?
 
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
-       kill -INT $PID $SLAVEPID
+       kill -HUP $PID $SLAVEPID
        kill -KILL $SLURPPID
        exit $RC
 fi
@@ -212,39 +222,40 @@ RC=$?
 
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
-       kill -INT $PID $SLAVEPID
+       kill -HUP $PID $SLAVEPID
        kill -KILL $SLURPPID
        exit $RC
 fi
 
-echo "Using ldapsearch to read all the entries from the slave..."
+echo "Using ldapsearch to read all the entries from the sub-slave..."
 $LDAPSEARCH -S "" -b "ou=Groups, $BASEDN" -h $LOCALHOST -p $SLAVEPORT \
        'objectclass=*' > $SLAVEOUT 2>&1
 RC=$?
 
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
-       kill -INT $PID $SLAVEPID
+       kill -HUP $PID $SLAVEPID
        kill -KILL $SLURPPID
        exit $RC
 fi
 
-kill -INT $PID $SLAVEPID
+kill -HUP $PID $SLAVEPID
 kill -KILL $SLURPPID
 
 SEARCHOUT=$SUBMASTEROUT
 LDIF=$SLAVEOUT
 
-echo "Filtering master ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT | $STRIPATTR "description" > $SEARCHFLT
-echo "Filtering slave ldapsearch results..."
+echo "Filtering master subtree ldapsearch results..."
+. $LDIFFILTER < $SEARCHOUT > $SUBFLT0
+. $STRIPATTR "description" < $SUBFLT0 > $SEARCHFLT
+echo "Filtering sub-slave ldapsearch results..."
 . $LDIFFILTER < $LDIF > $LDIFFLT
 
-echo "Comparing retrieved entries from master and slave..."
+echo "Comparing retrieved subtree entries from master and sub-slave..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - master and slave databases differ"
+       echo "test failed - master and sub-slave subtree databases differ"
        exit 1
 fi
 
@@ -253,18 +264,18 @@ SEARCHOUT=$MASTEROUT
 echo "Filtering remaining data"
 . $LDIFFILTER < $SEARCHOUT | $STRIPATTR "description" > $SEARCHFLT
 
-echo "Stripping slave entries from master output..."
-$DIFF $SEARCHFLT $LDIFFLT | $UNDIFFFILTER > $SUBFLT
+echo "Stripping sub-slave entries from master output..."
+$DIFF $SEARCHFLT $LDIFFLT | $UNDIFFFILTER > $SUBFLT1
 
 echo "Stripping subtree entries from master output..."
 . $SUBFILTER 'ou=Groups,[ ]?o=University of Michigan,[ ]?c=US' < $SEARCHOUT \
        | $STRIPATTR "description" > $SUBFLT2
 
-echo "Comparing master minus subtree and master minus slave..."
-$CMP $SUBFLT $SUBFLT2 > $CMPOUT
+echo "Comparing master minus subtree and master minus sub-slave..."
+$BCMP $SUBFLT1 $SUBFLT2 > $CMPOUT
 
 if test $? != 0 ; then
-       echo "test failed - master and slave databases differ"
+       echo "test failed - master and sub-slave databases differ"
        exit 1
 fi