Set sync intervals to 3 seconds, use SLEEP1 and SLEEP2 for sync delays

diff --git a/tests/scripts/defines.sh b/tests/scripts/defines.sh
index f8813125ccd25c6ab9cd3fe69b73969f648488b8..4feb8abc4c6a55f60ff342d439c828adf3c3d06b 100755 (executable)
--- a/tests/scripts/defines.sh
+++ b/tests/scripts/defines.sh
@@ -46,6 +46,8 @@ WITH_SASL=${AC_WITH_SASL-no}
 USE_SASL=${SLAPD_USE_SASL-no}
 ACI=${AC_ACI_ENABLED-acino}
 THREADS=${AC_THREADS-threadsno}
+SLEEP1=${SLEEP1-5}
+SLEEP2=${SLEEP2-10}
 
 # dirs
 PROGDIR=./progs

diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 553eb09a40c37f29994e044d7d8dd5fa1655ab52..7b3c75e2f2c42e0960f61877e3487fd3aecaf05b 100755 (executable)
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -113,8 +113,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapmodify to modify producer directory..."
 
@@ -202,8 +202,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Try updating the consumer slapd..."
 $LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT2 -w $PASSWD > \

diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index 5adafc11498a11898da41e506ee0309abdd0f602..798e4f6f8bd7c0fc9f6c7fa42c3253b889ab85f4 100755 (executable)
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -13,7 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" ; then
+if test "$BACKEND" != "bdb" && test "$BACKEND" != "hdb" && test "$BACKEND" != "ldif"; then
        echo "Test does not support $BACKEND"
        exit 0
 fi
@@ -118,8 +118,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
@@ -251,8 +251,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping consumer to test recovery..."
 kill -HUP $SLAVEPID
@@ -288,8 +288,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID $SLAVEPID"
 
-echo "Waiting 25 seconds for syncrepl to receive changes..."
-sleep 25
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 if test ! $BACKLDAP = "ldapno" ; then
        echo "Try updating the consumer slapd..."
@@ -322,8 +322,8 @@ EOMODS
                exit $RC
        fi
 
-       echo "Waiting 15 seconds for syncrepl to receive changes..."
-       sleep 15
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 fi
 
 OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"

diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade
index 53687bb76dc3646fc27ec93c02583b4164875aa0..ee1ab2cf9921a68c7c4ec046a171df1170c67e0b 100755 (executable)
--- a/tests/scripts/test019-syncreplication-cascade
+++ b/tests/scripts/test019-syncreplication-cascade
@@ -237,8 +237,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 25 seconds for syncrepl to receive changes..."
-sleep 25
+echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..."
+sleep $SLEEP2
 
 echo "Using ldapmodify to modify master directory..."
 
@@ -326,8 +326,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 25 seconds for syncrepl to receive changes..."
-sleep 25
+echo "Waiting $SLEEP2 seconds for syncrepl to receive changes..."
+sleep $SLEEP2
 
 echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test033-glue-syncrepl b/tests/scripts/test033-glue-syncrepl
index 240f5a38a351c35860836563520692221bff1a0f..fbe75931e468d86dd438221f4276754f56154b3d 100755 (executable)
--- a/tests/scripts/test033-glue-syncrepl
+++ b/tests/scripts/test033-glue-syncrepl
@@ -132,9 +132,8 @@ case $RC in
        ;;
 esac
 
-SLEEP=15
-echo "Waiting $SLEEP seconds for shadow subtrees to sync..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for shadow subtrees to sync..."
+sleep $SLEEP1
 
 echo "Filtering original ldif used to create database..."
 . $LDIFFILTER < $GLUESYNCOUT > $LDIFFLT

diff --git a/tests/scripts/test043-delta-syncrepl b/tests/scripts/test043-delta-syncrepl
index 7675e7bcfe3fd6d8f1c2d6c591008008cddcfc08..b3099c0b9dd058da66ab3ac2337802d9fd35667d 100755 (executable)
--- a/tests/scripts/test043-delta-syncrepl
+++ b/tests/scripts/test043-delta-syncrepl
@@ -122,8 +122,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
@@ -242,8 +242,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping consumer to test recovery..."
 kill -HUP $SLAVEPID
@@ -288,8 +288,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID $SLAVEPID"
 
-echo "Waiting 25 seconds for syncrepl to receive changes..."
-sleep 25
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 if test ! $BACKLDAP = "ldapno" ; then
        echo "Try updating the consumer slapd..."
@@ -310,8 +310,8 @@ EOMODS
                exit $RC
        fi
 
-       echo "Waiting 15 seconds for syncrepl to receive changes..."
-       sleep 15
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 fi
 
 echo "Using ldapsearch to read all the entries from the producer..."

diff --git a/tests/scripts/test045-syncreplication-proxied b/tests/scripts/test045-syncreplication-proxied
index 2e6fe0db887b3c43df36d99363c8e371c1ada121..636df55d3c47ae3a0b62ff44dc5c168e7ab6f634 100755 (executable)
--- a/tests/scripts/test045-syncreplication-proxied
+++ b/tests/scripts/test045-syncreplication-proxied
@@ -203,9 +203,8 @@ for i in 1 2 3; do
                break
        fi
 
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 #echo "Using ldapsearch to read all the entries from the master..."
@@ -245,11 +244,10 @@ if test $? != 0 ; then
 fi
 
 CHECK=`expr $CHECK + 1`
-SLEEP=10
-echo "$CHECK > Stopping the provider, sleeping $SLEEP seconds and restarting it..."
+echo "$CHECK > Stopping the provider, sleeping $SLEEP2 seconds and restarting it..."
 kill -HUP "$MASTERPID"
 wait $MASTERPID
-sleep $SLEEP
+sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
@@ -379,9 +377,8 @@ fi
 
 # check slave contextCSN
 for i in 1 2 3; do
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
                '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
@@ -487,9 +484,8 @@ fi
 
 # check slave contextCSN
 for i in 1 2 3 4 5; do
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
                '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
@@ -593,9 +589,8 @@ for i in 1 2 3; do
                break
        fi
 
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 #echo "Using ldapsearch to read all the entries from the master..."
@@ -649,9 +644,8 @@ drink: Mad Dog 20/20
 
 EOMODS
 
-SLEEP=10
-echo "Waiting $SLEEP seconds for syncrepl to retry..."
-sleep $SLEEP
+echo "Waiting $SLEEP2 seconds for syncrepl to retry..."
+sleep $SLEEP2
 
 echo "Restarting consumer..."
 echo "======================= RESTART =======================" >> $LOG2
@@ -676,9 +670,8 @@ fi
 # check slave contextCSN
 
 for i in 1 2 3 4 5; do
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
                '(objectClass=*)' -s base contextCSN > "${SLAVEOUT}.$CHECK" 2>&1
@@ -750,9 +743,8 @@ if test $? != 0 ; then
        fi
        KILLPIDS="$MASTERPID $SLAVEPID $PROXYPID"
 
-       SLEEP=15
-       echo "  Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "  Waiting $SLEEP2 seconds for syncrepl to receive changes..."
+       sleep $SLEEP2
 
        #echo "Using ldapsearch to read all the entries from the slave..."
        $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT2 \
@@ -834,9 +826,8 @@ for i in 1 2 3; do
                break
        fi
 
-       SLEEP=5
-       echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-       sleep $SLEEP
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 #echo "Using ldapsearch to read all the entries from the master..."

diff --git a/tests/scripts/test048-syncrepl-multiproxy b/tests/scripts/test048-syncrepl-multiproxy
index 4d2b67501f1bf89442f327111a4c93503f142bb2..69fab7f08472582403c33e868a4ece2855c82d53 100755 (executable)
--- a/tests/scripts/test048-syncrepl-multiproxy
+++ b/tests/scripts/test048-syncrepl-multiproxy
@@ -159,9 +159,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=15
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 #echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
@@ -223,11 +222,10 @@ if test $? != 0 ; then
 fi
 
 CHECK=`expr $CHECK + 1`
-SLEEP=10
-echo "$CHECK > Stopping the provider, sleeping $SLEEP seconds and restarting it..."
+echo "$CHECK > Stopping the provider, sleeping $SLEEP2 seconds and restarting it..."
 kill -HUP "$MASTERPID"
 wait $MASTERPID
-sleep $SLEEP
+sleep $SLEEP2
 
 echo "======================= RESTART =======================" >> $LOG1
 $SLAPD -f $CONF1 -h $URI1 -d $LVL $TIMING >> $LOG1 2>&1 &
@@ -345,9 +343,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=15
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 #echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
@@ -457,9 +454,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$MASTERPID $P1SLAVEPID $R1SLAVEPID"
 
-SLEEP=25
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 #echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
@@ -539,9 +535,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=15
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 #echo "Using ldapsearch to read all the entries from the master..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \

diff --git a/tests/scripts/test049-sync-config b/tests/scripts/test049-sync-config
index 1b2629b3d9e27cb550c1d651e3140a9393dec81d..f2ff3338b1fb77e359a66102f81d895fa7e1f2de 100755 (executable)
--- a/tests/scripts/test049-sync-config
+++ b/tests/scripts/test049-sync-config
@@ -37,7 +37,7 @@ if test x"$SYNCMODE" = x ; then
 fi
 case "$SYNCMODE" in
        ro)
-               SYNCTYPE="type=refreshOnly interval=00:00:00:10"
+               SYNCTYPE="type=refreshOnly interval=00:00:00:03"
                ;;
        rp)
                SYNCTYPE="type=refreshAndPersist"
@@ -114,7 +114,7 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 -
 add: olcUpdateRef
 olcUpdateRef: $URI1
@@ -171,15 +171,14 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 -
 add: olcUpdateRef
 olcUpdateRef: $URI1
 EOF
 
-SLEEP=10
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapsearch to check that syncrepl received config changes..."
 RC=32
@@ -191,8 +190,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 if test $RC != 0 ; then
@@ -247,7 +246,7 @@ olcRootDN: $MANAGERDN
 olcRootPW: $PASSWD
 olcSyncRepl: rid=002 provider=$URI1 binddn="$MANAGERDN" bindmethod=simple
   credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcUpdateRef: $URI1
 
 dn: olcOverlay=syncprov,olcDatabase={1}${BACKEND},cn=config
@@ -291,9 +290,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapsearch to check that syncrepl received database changes..."
 RC=32
@@ -305,8 +303,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 if test $RC != 0 ; then

diff --git a/tests/scripts/test050-syncrepl-multimaster b/tests/scripts/test050-syncrepl-multimaster
index c3a7d8f42fcaff8e4e49c7cde18172f7a89707b0..6583adfaec7edbf70bd4ecdab4fb09b1816bb21d 100755 (executable)
--- a/tests/scripts/test050-syncrepl-multimaster
+++ b/tests/scripts/test050-syncrepl-multimaster
@@ -40,7 +40,7 @@ if test x"$SYNCMODE" = x ; then
 fi
 case "$SYNCMODE" in
        ro)
-               SYNCTYPE="type=refreshOnly interval=00:00:00:10"
+               SYNCTYPE="type=refreshOnly interval=00:00:00:03"
                ;;
        rp)
                SYNCTYPE="type=refreshAndPersist"
@@ -173,13 +173,13 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=002 provider=$URI2 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=003 provider=$URI3 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 -
 add: olcMirrorMode
 olcMirrorMode: TRUE
@@ -229,13 +229,13 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=002 provider=$URI2 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=003 provider=$URI3 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 -
 add: olcMirrorMode
 olcMirrorMode: TRUE
@@ -279,13 +279,13 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=001 provider=$URI1 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=002 provider=$URI2 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=003 provider=$URI3 binddn="cn=config" bindmethod=simple
   credentials=$CONFIGPW searchbase="cn=config" type=refreshAndPersist
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 -
 add: olcMirrorMode
 olcMirrorMode: TRUE
@@ -337,13 +337,13 @@ olcRootDN: $MANAGERDN
 olcRootPW: $PASSWD
 olcSyncRepl: rid=004 provider=$URI1 binddn="$MANAGERDN" bindmethod=simple
   credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=005 provider=$URI2 binddn="$MANAGERDN" bindmethod=simple
   credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcSyncRepl: rid=006 provider=$URI3 binddn="$MANAGERDN" bindmethod=simple
   credentials=$PASSWD searchbase="$BASEDN" $SYNCTYPE
-  retry="5 5 300 5" timeout=3
+  retry="3 5 300 5" timeout=3
 olcMirrorMode: TRUE
 
 dn: olcOverlay=syncprov,olcDatabase={1}${BACKEND},cn=config
@@ -387,9 +387,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapadd to populate consumer1..."
 $LDAPADD -D "$MANAGERDN" -H $URI2 -w $PASSWD -f $LDIFADD1 \
@@ -401,9 +400,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapadd to populate consumer2..."
 $LDAPADD -D "$MANAGERDN" -H $URI3 -w $PASSWD \
@@ -420,9 +418,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapmodify to add to the producer entries that will be deleted..."
 $LDAPMODIFY -D "$MANAGERDN" -H $URI1 -w $PASSWD \
@@ -452,9 +449,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapmodify to delete entries from consumer1..."
 $LDAPMODIFY -D "$MANAGERDN" -H $URI2 -w $PASSWD \
@@ -469,9 +465,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapmodify to delete entries from consumer2..."
 $LDAPMODIFY -D "$MANAGERDN" -H $URI3 -w $PASSWD \
@@ -486,9 +481,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-SLEEP=20
-echo "Waiting $SLEEP seconds for syncrepl to receive changes..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Using ldapsearch to check that syncrepl received database changes..."
 RC=32
@@ -500,8 +494,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 if test $RC != 0 ; then
@@ -520,8 +514,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 
 if test $RC != 0 ; then
@@ -747,9 +741,8 @@ if test $RC != 0 ; then
 fi
 
 # Insert modifications and more tests here.
-SLEEP=10
-echo "Waiting $SLEEP seconds for servers to resync..."
-sleep $SLEEP
+echo "Waiting $SLEEP1 seconds for servers to resync..."
+sleep $SLEEP1
 
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 

diff --git a/tests/scripts/test053-syncprov-glue b/tests/scripts/test053-syncprov-glue
index 429b17becfc32c1e4446e611b33c3040d213ccbe..a3fb4e8b95d942e2e2c6127254cc892a48d4c840 100755 (executable)
--- a/tests/scripts/test053-syncprov-glue
+++ b/tests/scripts/test053-syncprov-glue
@@ -50,7 +50,7 @@ if test x"$SYNCMODE" = x ; then
 fi
 case "$SYNCMODE" in
        ro)
-               SYNCTYPE="type=refreshOnly interval=00:00:00:10"
+               SYNCTYPE="type=refreshOnly interval=00:00:00:03"
                ;;
        rp)
                SYNCTYPE="type=refreshAndPersist"
@@ -394,7 +394,7 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=1 provider=$URI2 searchbase="ou=ou1,$BASEDN"
   binddn="$MANAGERDN" bindmethod=simple credentials=$PASSWD
-  $SYNCTYPE retry="5 5 300 5" timeout=1
+  $SYNCTYPE retry="3 5 300 5" timeout=1
 
 EOF
 RC=$?
@@ -411,7 +411,7 @@ changetype: modify
 add: olcSyncRepl
 olcSyncRepl: rid=1 provider=$URI1 searchbase="$BASEDN"
   binddn="$MANAGERDN" bindmethod=simple credentials=$PASSWD
-  $SYNCTYPE retry="5 5 300 5" timeout=1
+  $SYNCTYPE retry="3 5 300 5" timeout=1
 
 EOF
 RC=$?
@@ -431,8 +431,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"
@@ -467,8 +467,8 @@ for i in 0 1 2 3 4 5; do
                RC=0
                break
        fi
-       echo "Waiting 5 seconds for syncrepl to receive changes..."
-       sleep 5
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 done
 if test $RC != 0 ; then
        echo "ldapsearch failed ($RC)!"

diff --git a/tests/scripts/test054-syncreplication-parallel-load b/tests/scripts/test054-syncreplication-parallel-load
index 95846c4f897bd05d3c0732a79c15c863dd1c211a..e7550449cbd1ea5c403abca3f8bf79677baabb25 100755 (executable)
--- a/tests/scripts/test054-syncreplication-parallel-load
+++ b/tests/scripts/test054-syncreplication-parallel-load
@@ -125,8 +125,8 @@ $LDAPADD -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD < \
 C2PID=$!
 wait $C1PID $C2PID
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping the provider, sleeping 10 seconds and restarting it..."
 kill -HUP "$PID"
@@ -261,8 +261,8 @@ if test $RC != 0 ; then
        exit $RC
 fi
 
-echo "Waiting 15 seconds for syncrepl to receive changes..."
-sleep 15
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 echo "Stopping consumer to test recovery..."
 kill -HUP $SLAVEPID
@@ -298,8 +298,8 @@ if test $WAIT != 0 ; then
 fi
 KILLPIDS="$PID $SLAVEPID"
 
-echo "Waiting 25 seconds for syncrepl to receive changes..."
-sleep 25
+echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+sleep $SLEEP1
 
 if test ! $BACKLDAP = "ldapno" ; then
        echo "Try updating the consumer slapd..."
@@ -332,8 +332,8 @@ EOMODS
                exit $RC
        fi
 
-       echo "Waiting 15 seconds for syncrepl to receive changes..."
-       sleep 15
+       echo "Waiting $SLEEP1 seconds for syncrepl to receive changes..."
+       sleep $SLEEP1
 fi
 
 OPATTRS="entryUUID creatorsName createTimestamp modifiersName modifyTimestamp"