X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest018-syncreplication-persist;h=19fc05e728f8c8ae050303faf5e31eec0257dd06;hb=3743a5a68e4d608949d5fd04904733ee5c1ac959;hp=f923341950cb06bec58f572f2be6425c753c4865;hpb=88ffa89ae3daad9f924ddb22ba8b372135109ca9;p=openldap diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index f923341950..19fc05e728 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -2,7 +2,7 @@ # $OpenLDAP$ ## This work is part of OpenLDAP Software . ## -## Copyright 1998-2010 The OpenLDAP Foundation. +## Copyright 1998-2012 The OpenLDAP Foundation. ## All rights reserved. ## ## Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4 # # Test replication: -# - start producer +# - start provider # - start consumer # - populate over ldap # - perform some modifies and deleted @@ -35,7 +35,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4 # - 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 < $SRMASTERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! @@ -47,7 +47,7 @@ KILLPIDS="$PID" 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 "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 @@ -65,7 +65,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to create the context prefix entry in the producer..." +echo "Using ldapadd to create the context prefix entry in the provider..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDCP > /dev/null 2>&1 RC=$? @@ -105,7 +105,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to populate the producer directory..." +echo "Using ldapadd to populate the provider directory..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDNOCP > /dev/null 2>&1 RC=$? @@ -118,13 +118,13 @@ fi echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -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" -h $LOCALHOST -p $PORT1 \ '(objectclass=*)' '*' $OPATTRS > $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 @@ -140,16 +140,16 @@ if test $RC != 0 ; then exit $RC fi -echo "Filtering producer results..." +echo "Filtering provider results..." $LDIFFILTER < $MASTEROUT > $MASTERFLT echo "Filtering consumer results..." $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" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -169,7 +169,7 @@ KILLPIDS="$PID $SLAVEPID" 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 "$MONITOR" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' > /dev/null 2>&1 @@ -190,7 +190,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapmodify to modify producer directory..." +echo "Using ldapmodify to modify provider directory..." # # Do some modifications @@ -327,13 +327,13 @@ fi echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -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" -h $LOCALHOST -p $PORT1 \ '(objectclass=*)' '*' $OPATTRS > $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 @@ -349,16 +349,16 @@ if test $RC != 0 ; then exit $RC fi -echo "Filtering producer results..." +echo "Filtering provider results..." $LDIFFILTER < $MASTEROUT > $MASTERFLT echo "Filtering consumer results..." $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" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -367,7 +367,7 @@ echo "Stopping consumer to test recovery..." kill -HUP $SLAVEPID wait $SLAVEPID -echo "Modifying more entries on the producer..." +echo "Modifying more entries on the provider..." $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD >> \ $TESTOUT 2>&1 << EOMODS dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com @@ -390,6 +390,18 @@ changetype: modify replace: description description: Example, Inc. itsdomain2 test domain +# rename with a newly added newSuperior while the consumer is down (ITS#6472) +dn: ou=New Branch,dc=example,dc=com +changetype: add +objectClass: organizationalUnit +ou: New Branch + +dn: cn=Dorothy Stevens, ou=Alumni Association, ou=People, dc=example,dc=com +changetype: modrdn +newrdn: cn=Dorothy Stevens +deleteoldrdn: 0 +newsuperior: ou=New Branch,dc=example,dc=com + EOMODS RC=$? @@ -412,13 +424,13 @@ KILLPIDS="$PID $SLAVEPID" echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..." sleep $SLEEP1 -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" -h $LOCALHOST -p $PORT1 \ '(objectclass=*)' '*' $OPATTRS > $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 @@ -434,16 +446,16 @@ if test $RC != 0 ; then exit $RC fi -echo "Filtering producer results..." +echo "Filtering provider results..." $LDIFFILTER < $MASTEROUT > $MASTERFLT echo "Filtering consumer results..." $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" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi @@ -483,13 +495,13 @@ EOMODS sleep $SLEEP1 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" -h $LOCALHOST -p $PORT1 \ '(objectclass=*)' '*' $OPATTRS > $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 @@ -505,16 +517,16 @@ if test $RC != 0 ; then exit $RC fi -echo "Filtering producer results..." +echo "Filtering provider results..." $LDIFFILTER < $MASTEROUT > $MASTERFLT echo "Filtering consumer results..." $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" test $KILLSERVERS != no && kill -HUP $KILLPIDS exit 1 fi