From 2449625813ab74b72e28f38826c175f47da7927b Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 27 Jan 2007 18:39:36 +0000 Subject: [PATCH] cleanup --- tests/scripts/test043-delta-syncrepl | 46 ++++++++++++++-------------- tests/scripts/test049-sync-config | 4 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl index fcb2bf3252..253d764067 100755 --- a/tests/scripts/test043-delta-syncrepl +++ b/tests/scripts/test043-delta-syncrepl @@ -34,15 +34,15 @@ mkdir -p $TESTDIR $DBDIR1A $DBDIR1B $DBDIR2 # # Test replication: -# - start master -# - start slave +# - start producer +# - start consumer # - populate over ldap # - perform some modifies and deleted -# - attempt to modify the slave (referral or chain) +# - attempt to modify the consumer (referral or chain) # - 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 < $DSRMASTERCONF > $CONF1 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & PID=$! @@ -54,7 +54,7 @@ KILLPIDS="$PID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +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 @@ -72,7 +72,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapadd to create the context prefix entries in the master..." +echo "Using ldapadd to create the context prefix entries in the producer..." $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \ $LDIFORDEREDCP > /dev/null 2>&1 RC=$? @@ -82,7 +82,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 < $DSRSLAVECONF > $CONF2 $SLAPD -f $CONF2 -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & SLAVEPID=$! @@ -94,7 +94,7 @@ KILLPIDS="$KILLPIDS $SLAVEPID" sleep 1 -echo "Using ldapsearch to check that slave slapd is running..." +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 @@ -112,7 +112,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=$? @@ -139,7 +139,7 @@ KILLPIDS="$PID $SLAVEPID" sleep 1 -echo "Using ldapsearch to check that master slapd is running..." +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 @@ -157,7 +157,7 @@ if test $RC != 0 ; then exit $RC fi -echo "Using ldapmodify to modify master directory..." +echo "Using ldapmodify to modify producer directory..." # # Do some modifications @@ -249,7 +249,7 @@ echo "Stopping consumer to test recovery..." kill -HUP $SLAVEPID sleep 10 -echo "Modifying more entries on the master..." +echo "Modifying more entries on the producer..." $LDAPMODIFY -v -D "$BJORNSDN" -h $LOCALHOST -p $PORT1 -w bjorn >> \ $TESTOUT 2>&1 << EOMODS dn: cn=Rosco P. Coltrane, ou=Retired, ou=People, dc=example,dc=com @@ -292,7 +292,7 @@ echo "Waiting 25 seconds for syncrepl to receive changes..." sleep 25 if test ! $BACKLDAP = "ldapno" ; then - echo "Try updating the slave slapd..." + 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 @@ -314,40 +314,40 @@ EOMODS sleep 15 fi -echo "Using ldapsearch to read all the entries from the master..." +echo "Using ldapsearch to read all the entries from the producer..." $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \ 'objectclass=*' \* + > $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 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..." -. $LDIFFILTER < $MASTEROUT | grep -iv auditcontext: > $MASTERFLT -echo "Filtering slave results..." -. $LDIFFILTER < $SLAVEOUT | grep -iv auditcontext: > $SLAVEFLT +echo "Filtering producer results..." +. $LDIFFILTER < $MASTEROUT | grep -iv ^auditcontext: > $MASTERFLT +echo "Filtering consumer results..." +. $LDIFFILTER < $SLAVEOUT | grep -iv ^auditcontext: > $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 diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config index a8840b8e33..d8b08d469d 100755 --- a/tests/scripts/test049-sync-config +++ b/tests/scripts/test049-sync-config @@ -45,7 +45,7 @@ mkdir -p $TESTDIR $PRODIR $CONDIR $DBPRO $DBCON $CFPRO $CFCON echo "Starting master slapd on TCP/IP port $PORT1..." $SLAPADD -F $CFPRO -n 0 -l $DYNAMICCONF cd $PRODIR -../../$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > $LOG1 2>&1 & +$SLAPD -F ./slapd.d -h $URI1 -d $LVL $TIMING > ../../$LOG1 2>&1 & PID=$! if test $WAIT != 0 ; then echo PID $PID @@ -118,7 +118,7 @@ fi echo "Starting slave slapd on TCP/IP port $PORT2..." $SLAPADD -F $CFCON -n 0 -l $DYNAMICCONF cd $CONDIR -../../$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > $LOG2 2>&1 & +$SLAPD -F ./slapd.d -h $URI2 -d $LVL $TIMING > ../../$LOG2 2>&1 & SLAVEPID=$! if test $WAIT != 0 ; then echo SLAVEPID $SLAVEPID -- 2.39.5