Diff for /tests/scripts/test017-syncreplication-refresh between versions 1.24 and 1.24.2.2

version 1.24, 2004/11/25 20:16:56 version 1.24.2.2, 2005/10/05 17:41:32
Line 1 Line 1
 #! /bin/sh  #! /bin/sh
 # $OpenLDAP: pkg/ldap/tests/scripts/test017-syncreplication-refresh,v 1.23 2004/04/21 20:14:02 kurt Exp $  # $OpenLDAP: pkg/ldap/tests/scripts/test017-syncreplication-refresh,v 1.31 2005/09/30 05:32:50 hyc 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-2004 The OpenLDAP Foundation.  ## Copyright 1998-2005 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 21  if test $SYNCPROV = syncprovno; then Line 21  if test $SYNCPROV = syncprovno; then
         exit 0          exit 0
 fi   fi 
   
 mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3  mkdir -p $TESTDIR $DBDIR1 $DBDIR2
   
 #  #
 # Test replication:  # Test replication:
Line 29  mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR Line 29  mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR
 # - start slave  # - start slave
 # - populate over ldap  # - populate over ldap
 # - perform some modifies and deleted  # - perform some modifies and deleted
   # - attempt to modify the slave (referral)
 # - retrieve database over ldap and compare against expected results  # - retrieve database over ldap and compare against expected results
 #  #
   
Line 42  if test $WAIT != 0 ; then Line 43  if test $WAIT != 0 ; then
 fi  fi
 KILLPIDS="$PID"  KILLPIDS="$PID"
   
   sleep 1
   
 echo "Using ldapsearch to check that master slapd is running..."  echo "Using ldapsearch to check that master slapd is running..."
 for i in 0 1 2 3 4 5; do  for i in 0 1 2 3 4 5; do
         $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
Line 80  if test $WAIT != 0 ; then Line 83  if test $WAIT != 0 ; then
 fi  fi
 KILLPIDS="$KILLPIDS $SLAVEPID"  KILLPIDS="$KILLPIDS $SLAVEPID"
   
   sleep 1
   
 echo "Using ldapsearch to check that slave slapd is running..."  echo "Using ldapsearch to check that slave slapd is running..."
 for i in 0 1 2 3 4 5; do  for i in 0 1 2 3 4 5; do
         $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \          $LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT2 \
Line 200  fi Line 205  fi
 echo "Waiting 15 seconds for syncrepl to receive changes..."  echo "Waiting 15 seconds for syncrepl to receive changes..."
 sleep 15  sleep 15
   
   echo "Try updating the slave 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: unless the chain overlay is configured appropriately ;)
   
   EOMODS
   
   RC=$?
   
   # expect 10 (LDAP_REFERRAL)...
   if test $RC != 10 ; then
           echo "ldapmodify should have failed ($RC)!"
           test $KILLSERVERS != no && kill -HUP $KILLPIDS
           exit $RC
   fi
   
 echo "Using ldapsearch to read all the entries from the master..."  echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \  $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
         'objectclass=*' > $MASTEROUT 2>&1          'objectclass=*' > $MASTEROUT 2>&1

Removed from v.1.24  
changed lines
  Added in v.1.24.2.2


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