From aff5133b8901975dde23c9058a8dcb35c7369f7b Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 19 Jan 2005 20:40:30 +0000
Subject: [PATCH] persist looks like a better place to have updates as quickly
 as possible...

---
 tests/data/slapd-syncrepl-slave-persist1.conf | 15 ++++++++++++
 tests/data/slapd-syncrepl-slave-refresh1.conf | 15 ------------
 tests/scripts/test017-syncreplication-refresh | 23 ++++---------------
 tests/scripts/test018-syncreplication-persist | 23 +++++++++++++++----
 4 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/tests/data/slapd-syncrepl-slave-persist1.conf b/tests/data/slapd-syncrepl-slave-persist1.conf
index bc015aa368..75520f9268 100644
--- a/tests/data/slapd-syncrepl-slave-persist1.conf
+++ b/tests/data/slapd-syncrepl-slave-persist1.conf
@@ -29,6 +29,21 @@ argsfile    ./testrun/slapd.4.args
 #monitormod#moduleload back_monitor.la
 #syncprovmod#modulepath ../servers/slapd/overlays/
 #syncprovmod#moduleload syncprov.la
+#ldapmod#modulepath ../servers/slapd/back-ldap/
+#ldapmod#moduleload back_ldap.la
+
+#ldapyes#overlay		chain
+#ldapyes#chain-uri		@URI1@
+#ldapyes#chain-idassert-method	"simple"
+#ldapyes#chain-idassert-authcDN	"cn=Manager,dc=example,dc=com"
+#ldapyes#chain-idassert-passwd	secret
+#ldapyes#chain-idassert-mode	self
+#ldapmod#overlay		chain
+#ldapmod#chain-uri		@URI1@
+#ldapmod#chain-idassert-method	"simple"
+#ldapmod#chain-idassert-authcDN	"cn=Manager,dc=example,dc=com"
+#ldapmod#chain-idassert-passwd	secret
+#ldapmod#chain-idassert-mode	self
 
 #######################################################################
 # consumer database definitions
diff --git a/tests/data/slapd-syncrepl-slave-refresh1.conf b/tests/data/slapd-syncrepl-slave-refresh1.conf
index 84fe5c2344..ddf424dfb3 100644
--- a/tests/data/slapd-syncrepl-slave-refresh1.conf
+++ b/tests/data/slapd-syncrepl-slave-refresh1.conf
@@ -29,21 +29,6 @@ argsfile    ./testrun/slapd.2.args
 #monitormod#moduleload back_monitor.la
 #syncprovmod#modulepath ../servers/slapd/overlays/
 #syncprovmod#moduleload syncprov.la
-#ldapmod#modulepath ../servers/slapd/back-ldap/
-#ldapmod#moduleload back_ldap.la
-
-#ldapyes#overlay		chain
-#ldapyes#chain-uri		@URI1@
-#ldapyes#chain-idassert-method	"simple"
-#ldapyes#chain-idassert-authcDN	"cn=Manager,dc=example,dc=com"
-#ldapyes#chain-idassert-passwd	secret
-#ldapyes#chain-idassert-mode	self
-#ldapmod#overlay		chain
-#ldapmod#chain-uri		@URI1@
-#ldapmod#chain-idassert-method	"simple"
-#ldapmod#chain-idassert-authcDN	"cn=Manager,dc=example,dc=com"
-#ldapmod#chain-idassert-passwd	secret
-#ldapmod#chain-idassert-mode	self
 
 #######################################################################
 # consumer database definitions
diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh
index 3b7eecf0b2..b57bb24f9f 100755
--- a/tests/scripts/test017-syncreplication-refresh
+++ b/tests/scripts/test017-syncreplication-refresh
@@ -213,24 +213,11 @@ EOMODS
 
 RC=$?
 
-if test $BACKLDAP = "ldapno" ; then
-	# expect 10 (LDAP_REFERRAL)...
-	if test $RC != 10 ; then
-		echo "ldapmodify should have failed ($RC)!"
-		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit $RC
-	fi
-
-else
-	# expect 0 (LDAP_SUCCESS)...
-	if test $RC != 0 ; then
-		echo "ldapmodify failed ($RC)!"
-		test $KILLSERVERS != no && kill -HUP $KILLPIDS
-		exit $RC
-	fi
-
-	echo "Waiting 5 seconds for slurpd to send changes..."
-	sleep 5
+# 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..."
diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist
index ec9cc06090..2c4a9b44eb 100755
--- a/tests/scripts/test018-syncreplication-persist
+++ b/tests/scripts/test018-syncreplication-persist
@@ -255,11 +255,24 @@ 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
+if test $BACKLDAP = "ldapno" ; then
+	# expect 10 (LDAP_REFERRAL)...
+	if test $RC != 10 ; then
+		echo "ldapmodify should have failed ($RC)!"
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
+		exit $RC
+	fi
+
+else
+	# expect 0 (LDAP_SUCCESS)...
+	if test $RC != 0 ; then
+		echo "ldapmodify failed ($RC)!"
+		test $KILLSERVERS != no && kill -HUP $KILLPIDS
+		exit $RC
+	fi
+
+	echo "Waiting 5 seconds for slurpd to send changes..."
+	sleep 5
 fi
 
 echo "Using ldapsearch to read all the entries from the master..."
-- 
2.39.5