From: Ondřej Kuzník <ondra@mistotebe.net>
Date: Sun, 25 Jun 2017 15:49:29 +0000 (+0100)
Subject: Update tests to match latest configuration layout
X-Git-Tag: OPENLDAP_REL_ENG_2_5_1ALPHA~18^2~141
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=887c2661205bbf80fbe108da8fee4ee346346957;p=thirdparty%2Fopenldap.git

Update tests to match latest configuration layout
---

diff --git a/tests/data/lloadd-anon.conf b/tests/data/lloadd-anon.conf
index 4233ac323c..0a3ec0fe39 100644
--- a/tests/data/lloadd-anon.conf
+++ b/tests/data/lloadd-anon.conf
@@ -14,7 +14,8 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 # allow big PDUs from anonymous (for testing purposes)
-sockbuf_max_incoming 4194303
+sockbuf_max_incoming_client 4194303
+sockbuf_max_incoming_upstream 4194303
 
 backend uri=@URI2@
     numconns=3
diff --git a/tests/data/lloadd-backend-issues.conf b/tests/data/lloadd-backend-issues.conf
index 37d483516b..93ab68bff8 100644
--- a/tests/data/lloadd-backend-issues.conf
+++ b/tests/data/lloadd-backend-issues.conf
@@ -14,13 +14,16 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 # allow big PDUs from anonymous (for testing purposes)
-sockbuf_max_incoming 4194303
+sockbuf_max_incoming_client 4194303
+sockbuf_max_incoming_upstream 4194303
 
-# incorrect password
-backend uri=@URI2@
+bindconf
     bindmethod=simple
     binddn="cn=Manager,dc=example,dc=com"
-    credentials=wrong
+    credentials=secret
+
+# incorrect password (DB is empty)
+backend uri=@URI2@
     numconns=3
     bindconns=2
     retry=500
@@ -29,9 +32,6 @@ backend uri=@URI2@
 
 # backend is often unresponsive
 backend uri=@URI3@
-    bindmethod=simple
-    binddn="cn=Manager,dc=example,dc=com"
-    credentials=secret
     numconns=3
     bindconns=2
     retry=500
@@ -40,9 +40,6 @@ backend uri=@URI3@
 
 # unreachable backend (not running)
 backend uri=@URI4@
-    bindmethod=simple
-    binddn="cn=Manager,dc=example,dc=com"
-    credentials=wrong
     numconns=3
     bindconns=2
     retry=500
@@ -51,9 +48,6 @@ backend uri=@URI4@
 
 # backend that fails to resolve
 backend uri=ldap://does.not.resolve.example.com
-    bindmethod=simple
-    binddn="cn=Manager,dc=example,dc=com"
-    credentials=secret
     numconns=3
     bindconns=2
     retry=500
diff --git a/tests/data/lloadd.conf b/tests/data/lloadd.conf
index 30f5edf5cd..6112e3a214 100644
--- a/tests/data/lloadd.conf
+++ b/tests/data/lloadd.conf
@@ -14,14 +14,17 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 # allow big PDUs from anonymous (for testing purposes)
-sockbuf_max_incoming 4194303
+sockbuf_max_incoming_client 4194303
+sockbuf_max_incoming_upstream 4194303
 
 feature proxyauthz
 
-backend uri=@URI2@
+bindconf
     bindmethod=simple
     binddn="cn=Manager,dc=example,dc=com"
     credentials=secret
+
+backend uri=@URI2@
     numconns=3
     bindconns=2
     retry=5000
@@ -29,9 +32,6 @@ backend uri=@URI2@
     conn-max-pending=3
 
 backend uri=@URI3@
-    bindmethod=simple
-    binddn="cn=Manager,dc=example,dc=com"
-    credentials=secret
     numconns=3
     bindconns=2
     retry=5000
@@ -39,9 +39,6 @@ backend uri=@URI3@
     conn-max-pending=3
 
 backend uri=@URI4@
-    bindmethod=simple
-    binddn="cn=Manager,dc=example,dc=com"
-    credentials=secret
     numconns=3
     bindconns=2
     retry=5000
diff --git a/tests/scripts/lloadd/test000-rootdse b/tests/scripts/lloadd/test000-rootdse
index a92f315501..c20e999069 100755
--- a/tests/scripts/lloadd/test000-rootdse
+++ b/tests/scripts/lloadd/test000-rootdse
@@ -16,7 +16,7 @@
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
-mkdir -p $TESTDIR $DBDIR1
+mkdir -p $TESTDIR $DBDIR1 $DBDIR2 $DBDIR3
 
 echo "Starting slapd on TCP/IP port $PORT2..."
 . $CONFFILTER $BACKEND < $SCHEMACONF > $CONF2
@@ -29,7 +29,7 @@ fi
 KILLPIDS="$PID"
 
 echo "Starting a second slapd on TCP/IP port $PORT3..."
-. $CONFFILTER $BACKEND < $SCHEMACONF > $CONF3
+sed -e "s,$DBDIR1,$DBDIR2," < $CONF2 > $CONF3
 $SLAPD -f $CONF3 -h $URI3 -d $LVL > $LOG3 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then
@@ -39,7 +39,7 @@ fi
 KILLPIDS="$KILLPIDS $PID"
 
 echo "Starting a third slapd on TCP/IP port $PORT4..."
-. $CONFFILTER $BACKEND < $SCHEMACONF > $CONF4
+sed -e "s,$DBDIR1,$DBDIR3," < $CONF2 > $CONF4
 $SLAPD -f $CONF4 -h $URI4 -d $LVL > $LOG4 2>&1 &
 PID=$!
 if test $WAIT != 0 ; then