upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-27 01:59:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9632 Fix lloadd monitor tests to honour BASEPORT

Browse source
This commit is contained in:
Ondřej Kuzník 2021-09-01 16:14:43 +01:00 committed by Ondřej Kuzník
parent ff740a28ef
commit bd6d0b8e54
4 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/data/lloadd/monitor.ldif
View file

@ -67,7 +67,7 @@ objectClass: monitorContainer
dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
or
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9012/
olmServerURI: @URI2@
olmActiveConnections: 4
olmPendingConnections: 0
olmPendingOps: 0
@ -153,7 +153,7 @@ objectClass: monitorContainer
dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
or
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9012/
olmServerURI: @URI2@
olmActiveConnections: 4
olmPendingConnections: 0
olmPendingOps: 0
@ -204,7 +204,7 @@ olmFailedOps: 0
dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
tor
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9013/
olmServerURI: @URI3@
olmActiveConnections: 9
olmPendingConnections: 0
olmPendingOps: 0

10
tests/data/lloadd/test007-monitor.ldif
View file

@ -35,7 +35,7 @@ objectClass: monitorContainer
dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
or
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9012/
olmServerURI: @URI2@
olmActiveConnections: 4
olmPendingConnections: 0
olmPendingOps: 0
@ -121,7 +121,7 @@ objectClass: monitorContainer
dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
or
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9012/
olmServerURI: @URI2@
olmActiveConnections: 4
olmPendingConnections: 0
olmPendingOps: 0
@ -172,7 +172,7 @@ olmFailedOps: 0
dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
tor
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9013/
olmServerURI: @URI3@
olmActiveConnections: 9
olmPendingConnections: 0
olmPendingOps: 0
@ -308,7 +308,7 @@ objectClass: monitorContainer
dn: cn=backend,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Monit
or
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9012/
olmServerURI: @URI2@
olmActiveConnections: 4
olmPendingConnections: 0
olmPendingOps: 0
@ -359,7 +359,7 @@ olmFailedOps: 0
dn: cn=server 2,cn=first,cn=Backend Tiers,cn=Load Balancer,cn=Backends,cn=Moni
tor
objectClass: olmBalancerServer
olmServerURI: ldap://localhost:9013/
olmServerURI: @URI3@
olmActiveConnections: 9
olmPendingConnections: 0
olmPendingOps: 0

5
tests/scripts/lloadd/test004-monitor
View file

@ -345,7 +345,10 @@ LDIF=$DATADIR/lloadd/monitor.ldif
echo "Filtering ldapsearch results..."
$LDIFFILTER -s e < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
$LDIFFILTER -s e < $LDIF > $LDIFFLT
$LDIFFILTER -s e < $LDIF | sed \
-e "s|@URI2@|$URI2|g" \
-e "s|@URI3@|$URI3|g" \
> $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT

5
tests/scripts/lloadd/test007-coherence
View file

@ -485,7 +485,10 @@ LDIF=$DATADIR/lloadd/test007-monitor.ldif
echo "Filtering ldapsearch results..."
$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
echo "Filtering original ldif used to create database..."
$LDIFFILTER < $LDIF > $LDIFFLT
$LDIFFILTER < $LDIF | sed \
-e "s|@URI2@|$URI2|g" \
-e "s|@URI3@|$URI3|g" \
> $LDIFFLT
echo "Comparing filter output..."
$CMP $SEARCHFLT $LDIFFLT > $CMPOUT