From: Pierangelo Masarati <ando@openldap.org>
Date: Tue, 26 Apr 2005 00:06:07 +0000 (+0000)
Subject: reset candidates when intentionally abandoning; consistently handle referrals
X-Git-Tag: OPENLDAP_AC_BP~796
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6c65ad09b07327dff12b7e871c8165b38d7755f9;p=openldap

reset candidates when intentionally abandoning; consistently handle referrals
---

diff --git a/tests/data/metaconcurrency.out b/tests/data/metaconcurrency.out
index f6a4eca722..ca8d796b8f 100644
--- a/tests/data/metaconcurrency.out
+++ b/tests/data/metaconcurrency.out
@@ -426,3 +426,5 @@ pager: +1 313 555 2844
 facsimileTelephoneNumber: +1 313 555 9700
 telephoneNumber: +1 313 555 5331
 
+# refldap://:9010/cn=Somewhere,ou=Meta,dc=example,dc=com??sub
+
diff --git a/tests/data/slapd-meta.conf b/tests/data/slapd-meta.conf
index f98a5abf44..2ba1eed691 100644
--- a/tests/data/slapd-meta.conf
+++ b/tests/data/slapd-meta.conf
@@ -43,7 +43,9 @@ database	meta
 suffix		"o=Example,c=US"
 rootdn		"cn=Manager,o=Example,c=US"
 rootpw		secret
-nretries	forever
+dont-chase-referrals
+#nretries	forever
+nretries	1000
 
 # local
 uri		"@URI2@ou=Meta,o=Example,c=US"
diff --git a/tests/data/test-meta.ldif b/tests/data/test-meta.ldif
index 881b6203b7..39456f24bb 100644
--- a/tests/data/test-meta.ldif
+++ b/tests/data/test-meta.ldif
@@ -15,3 +15,10 @@ cn: Dan Aykroyd
 sn: Aykroyd
 userPassword: elwood
 description: Elwood Blues
+
+dn: cn=Somewhere,ou=Meta,dc=example,dc=com
+objectClass: referral
+objectClass: extensibleObject
+cn: Somewhere
+ref: ldap://:9010
+
diff --git a/tests/scripts/test036-meta-concurrency b/tests/scripts/test036-meta-concurrency
index dd5218bd31..68741cd1e0 100755
--- a/tests/scripts/test036-meta-concurrency
+++ b/tests/scripts/test036-meta-concurrency
@@ -170,6 +170,13 @@ for f in $TESTDIR/$DATADIR/do_read.* ; do
 	echo "ou=Meta,$METABASEDN" >> $f
 done
 
+# add a read that matches a referral in the local database only, 
+# but selects also the remote as candidate; this should be removed 
+# to compare execution times with test008...
+for f in $TESTDIR/$DATADIR/do_read.* ; do
+	echo "cn=Somewhere,ou=Meta,$METABASEDN" >> $f
+done
+
 echo "Using tester for concurrent server access..."
 $SLAPDTESTER -P "$PROGDIR" -d "$TESTDIR/$DATADIR" -h $LOCALHOST -p $PORT3 -D "cn=Manager,$METABASEDN" -w $PASSWD -l 50 # -r 20
 RC=$?