Diff for /tests/scripts/test017-syncreplication-refresh between versions 1.39 and 1.44

version 1.39, 2009/01/21 23:40:44 version 1.44, 2010/04/13 20:18:35
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test017-syncreplication-refresh,v 1.38 2008/11/22 22:48:17 hyc Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test017-syncreplication-refresh,v 1.43 2009/11/29 21:27:34 hallvard Exp $
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.  ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##  ##
 ## Copyright 1998-2009 The OpenLDAP Foundation.  ## Copyright 1998-2010 The OpenLDAP Foundation.
 ## All rights reserved.  ## All rights reserved.
 ##  ##
 ## Redistribution and use in source and binary forms, with or without  ## Redistribution and use in source and binary forms, with or without
Line 193  newsuperior: ou=Retired, ou=People, dc=e Line 193  newsuperior: ou=Retired, ou=People, dc=e
 dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com  dn: cn=James A Jones 2, ou=Information Technology Division, ou=People, dc=example,dc=com
 changetype: delete  changetype: delete
   
   dn: dc=testdomain1,dc=example,dc=com
   changetype: modrdn
   newrdn: dc=itsdomain1
   deleteoldrdn: 1
   
   dn: dc=itsdomain1,dc=example,dc=com
   changetype: modify
   replace: description
   description: Example, Inc. ITS test domain
   
   EOMODS
   
   RC=$?
   if test $RC != 0 ; then
           echo "ldapmodify failed ($RC)!"
           test $KILLSERVERS != no && kill -HUP $KILLPIDS
           exit $RC
   fi
   
   echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
   sleep $SLEEP1
   
   echo "Performing modrdn alone on the producer..."
   $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
           $TESTOUT 2>&1 << EOMODS
   dn: dc=testdomain2,dc=example,dc=com
   changetype: modrdn
   newrdn: dc=itsdomain2
   deleteoldrdn: 1
   
   EOMODS
   
   RC=$?
   if test $RC != 0 ; then
           echo "ldapmodify failed ($RC)!"
           test $KILLSERVERS != no && kill -HUP $KILLPIDS
           exit $RC
   fi
   
   echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
   sleep $SLEEP1
   
   echo "Performing modify alone on the producer..."
   $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
           $TESTOUT 2>&1 << EOMODS
   dn: dc=itsdomain2,dc=example,dc=com
   changetype: modify
   replace: description
   description: Example, Inc. itsdomain2 test domain
   
   EOMODS
   
   RC=$?
   if test $RC != 0 ; then
           echo "ldapmodify failed ($RC)!"
           test $KILLSERVERS != no && kill -HUP $KILLPIDS
           exit $RC
   fi
   
   echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
   sleep $SLEEP1
   
   echo "Performing larger modify on the producer..."
   $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
           $TESTOUT 2>&1 << EOMODS
   dn: cn=Alumni Assoc Staff,ou=Groups,dc=example,dc=com
   changetype: modify
   replace: objectClass
   objectClass: groupOfNames
   -
   replace: cn
   cn: Alumni Assoc Staff
   -
   replace: description
   description: blablabla
   -
   replace: member
   member: cn=Manager,dc=example,dc=com
   member: cn=Dorothy Stevens,ou=Alumni Association,ou=People,dc=example,dc=com
   member: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
   member: cn=Jane Doe,ou=Alumni Association,ou=People,dc=example,dc=com
   member: cn=Jennifer Smith,ou=Alumni Association,ou=People,dc=example,dc=com
   member: cn=Mark Elliot,ou=Alumni Association,ou=People,dc=example,dc=com
   member: cn=Ursula Hampster,ou=Alumni Association,ou=People,dc=example,dc=com
   
 EOMODS  EOMODS
   
 RC=$?  RC=$?
Line 222  RC=$? Line 307  RC=$?
 if test $RC != 10 ; then  if test $RC != 10 ; then
         echo "ldapmodify should have returned referral ($RC)!"          echo "ldapmodify should have returned referral ($RC)!"
         test $KILLSERVERS != no && kill -HUP $KILLPIDS          test $KILLSERVERS != no && kill -HUP $KILLPIDS
         exit $RC          exit 1
 fi  fi
   
 OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"  OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"
Line 252  fi Line 337  fi
 test $KILLSERVERS != no && kill -HUP $KILLPIDS  test $KILLSERVERS != no && kill -HUP $KILLPIDS
   
 echo "Filtering producer results..."  echo "Filtering producer results..."
 . $LDIFFILTER < $MASTEROUT > $MASTERFLT  $LDIFFILTER < $MASTEROUT > $MASTERFLT
 echo "Filtering consumer results..."  echo "Filtering consumer results..."
 . $LDIFFILTER < $SLAVEOUT > $SLAVEFLT  $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
   
 echo "Comparing retrieved entries from producer and consumer..."  echo "Comparing retrieved entries from producer and consumer..."
 $CMP $MASTERFLT $SLAVEFLT > $CMPOUT  $CMP $MASTERFLT $SLAVEFLT > $CMPOUT

Removed from v.1.39  
changed lines
  Added in v.1.44


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org