reset candidates when intentionally abandoning; consistently handle referrals

diff --git a/tests/data/metaconcurrency.out b/tests/data/metaconcurrency.out
index f6a4eca722ad443abe4876d8a7111ad087b8b8db..ca8d796b8f8efaf511296d1d320449f13942469a 100644 (file)
--- 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 f98a5abf449a75cf09ae3f6d9eeb870b45bb0ae9..2ba1eed6915eaf440441e778dcfc9f21036060a7 100644 (file)
--- 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 881b6203b78e468804da7a1c1fa5192a12fa80c4..39456f24bb1efa378bf04439771015bee15d2c4d 100644 (file)
--- 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 dd5218bd314c0340f3500ec0449a284d9177dd3d..68741cd1e0ea2a85753acf7e75f0dd7f6fe0b3f6 100755 (executable)
--- 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=$?