mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-07-12 18:59:50 +03:00
The existing patches were requiring an increasing amount of fuzz in order to apply against recent versions of openldap. With this commit I have applied the patches on top of the OPENLDAP_REL_ENG_2_6_3 tag from the openldap upstream repository, and then re-generated the patch files with `git format-patch`.
84 lines
3.3 KiB
Diff
84 lines
3.3 KiB
Diff
From aef7e9c3c6678016c103243eb6476bc8b5e0e721 Mon Sep 17 00:00:00 2001
|
|
From: Lars Kellogg-Stedman <lars@oddbit.com>
|
|
Date: Fri, 19 Aug 2022 22:44:04 -0400
|
|
Subject: [PATCH 5/8] Correct command line syntax in lloadd tests
|
|
|
|
---
|
|
tests/scripts/lloadd/test004-monitor | 6 +++---
|
|
tests/scripts/lloadd/test007-coherence | 8 ++++----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/tests/scripts/lloadd/test004-monitor b/tests/scripts/lloadd/test004-monitor
|
|
index 9ab4045..677e3e7 100755
|
|
--- a/tests/scripts/lloadd/test004-monitor
|
|
+++ b/tests/scripts/lloadd/test004-monitor
|
|
@@ -218,7 +218,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until connections are established..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmOutgoingConnections:4' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
@@ -269,7 +269,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until connections are established..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmOutgoingConnections:13' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
@@ -306,7 +306,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until global counters are updated..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmCompletedOps:2' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
diff --git a/tests/scripts/lloadd/test007-coherence b/tests/scripts/lloadd/test007-coherence
|
|
index a78d8e7..7b91c28 100755
|
|
--- a/tests/scripts/lloadd/test007-coherence
|
|
+++ b/tests/scripts/lloadd/test007-coherence
|
|
@@ -239,7 +239,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until connections are established..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmOutgoingConnections:4' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
@@ -291,7 +291,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until connections are established..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmOutgoingConnections:13' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
@@ -338,7 +338,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until global counters are updated..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmCompletedOps:20' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
@@ -443,7 +443,7 @@ fi
|
|
# wait for it to settle
|
|
echo "Waiting until global counters are updated..."
|
|
for i in 0 1 2 3 4 5; do
|
|
- $LDAPCOMPARE "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" -H $URI6 \
|
|
+ $LDAPCOMPARE -H $URI6 "cn=Other,cn=Operations,cn=Load Balancer,cn=Backends,cn=monitor" \
|
|
'olmCompletedOps:28' > /dev/null 2>&1
|
|
RC=$?
|
|
if test $RC = 6 ; then
|
|
--
|
|
2.37.1
|
|
|