X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest054-syncreplication-parallel-load;h=ee889ec6368ed4c02ffff6614a6f80ae14c1308e;hb=fc1396fa2e94ee2e752fd7c3ea5bb22f6592398a;hp=585da2189a6a375bfba0fe606a299435bb2b333e;hpb=4af9eb971559e3a1f0432615e93ec870dc753ddb;p=openldap
diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index 585da2189a..ee889ec636 100755
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -2,7 +2,7 @@
# $OpenLDAP$
## This work is part of OpenLDAP Software .
##
-## Copyright 1998-2009 The OpenLDAP Foundation.
+## Copyright 1998-2012 The OpenLDAP Foundation.
## All rights reserved.
##
## Redistribution and use in source and binary forms, with or without
@@ -13,11 +13,6 @@
## top-level directory of the distribution or, alternatively, at
## .
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
- echo "Test does not support $BACKEND"
- exit 0
-fi
-
echo "running defines.sh"
. $SRCDIR/scripts/defines.sh
@@ -30,7 +25,7 @@ mkdir -p $TESTDIR $DBDIR1 $DBDIR4
#
# Test replication:
-# - start producer
+# - start provider
# - start consumer
# - populate over ldap
# - perform some modifies and deleted
@@ -38,7 +33,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=$!
@@ -50,7 +45,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
@@ -68,7 +63,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=$?
@@ -116,7 +111,7 @@ sed -e 's/[Oo][Uu]=/ou=More /g' -e 's/^[Oo][Uu]: /ou: More /' \
-e 's/^cn: Manager/cn: More Manager/' \
$LDIFORDEREDNOCP > $MORELDIF
-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 > $TESTOUT1 2>&1 &
C1PID=$!
@@ -143,7 +138,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
@@ -164,7 +159,7 @@ fi
echo "Waiting 10 seconds to let the system catch up"
sleep 10
-echo "Using ldapmodify to modify producer directory..."
+echo "Using ldapmodify to modify provider directory..."
#
# Do some modifications
@@ -268,7 +263,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
@@ -338,13 +333,13 @@ fi
OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"
-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
@@ -362,16 +357,16 @@ fi
test $KILLSERVERS != no && kill -HUP $KILLPIDS
-echo "Filtering producer results..."
-. $LDIFFILTER < $MASTEROUT > $MASTERFLT
+echo "Filtering provider results..."
+$LDIFFILTER < $MASTEROUT > $MASTERFLT
echo "Filtering consumer results..."
-. $LDIFFILTER < $SLAVEOUT > $SLAVEFLT
+$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"
exit 1
fi