[Pkg-openldap-devel] [openldap] 01/02: Fix intermittent test064 failures (#770890)

[Ryan Tandy]

This is an automated email from the git hooks/post-receive script.

rtandy-guest pushed a commit to branch master
in repository openldap.

commit 614469cfe452a14c59f8454f00b283f8c75f9529
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Sun May 28 09:35:35 2017 -0700

    Fix intermittent test064 failures (#770890)
---
 debian/changelog                                   |  8 +++++
 ...S-8644-wait-for-slapd-to-start-in-test064.patch | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 49 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7a6b7c6..235d848 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+openldap (2.4.44+dfsg-5) UNRELEASED; urgency=medium
+
+  * ITS-8644-wait-for-slapd-to-start-in-test064.patch: Fix an intermittently 
+    failing test by waiting for slapd to start before running tests.
+    (ITS#8644) (Closes: #770890)
+
+ -- Ryan Tandy <ryan at nardis.ca>  Sun, 28 May 2017 09:33:14 -0700
+
 openldap (2.4.44+dfsg-4) unstable; urgency=medium
 
   * Improve the slapd/ppolicy_schema_needs_update debconf template. Thanks to 
diff --git a/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch b/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch
new file mode 100644
index 0000000..1e3f8b0
--- /dev/null
+++ b/debian/patches/ITS-8644-wait-for-slapd-to-start-in-test064.patch
@@ -0,0 +1,40 @@
+From b622163ecf14a179d932f779164af5e393311dd8 Mon Sep 17 00:00:00 2001
+From: Ryan Tandy <ryan at nardis.ca>
+Date: Tue, 25 Apr 2017 01:28:25 +0000
+Subject: [PATCH] ITS#8644 wait for slapd to start in test064
+
+---
+ tests/scripts/test064-constraint | 17 +++++++++++++++++
+ 1 file changed, 17 insertions(+)
+
+diff --git a/tests/scripts/test064-constraint b/tests/scripts/test064-constraint
+index 94f86be..2ac53ac 100755
+--- a/tests/scripts/test064-constraint
++++ b/tests/scripts/test064-constraint
+@@ -117,6 +117,23 @@ if test $WAIT != 0 ; then
+ fi
+ sleep 1
+ 
++echo "Using ldapsearch to check that slapd is running..."
++for i in 0 1 2 3 4 5; do
++	$LDAPSEARCH -s base -b "$MONITOR" -h $LOCALHOST -p $PORT1 \
++		'objectclass=*' > /dev/null 2>&1
++	RC=$?
++	if test $RC = 0 ; then
++		break
++	fi
++	echo "Waiting 5 seconds for slapd to start..."
++	sleep 5
++done
++if test $RC != 0 ; then
++	echo "ldapsearch failed ($RC)!"
++	test $KILLSERVERS != no && kill -HUP $KILLPIDS
++	exit $RC
++fi
++
+ echo "Adding basic structure..."
+ $LDAPADD -D "$MANAGERDN" -H $URI1 -w $PASSWD -f $ROOTLDIF &>/dev/null
+ RC=$?
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 723457e..a97cede 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,4 @@ heimdal-fix
 ITS6035-olcauthzregex-needs-restart.patch
 set-maintainer-name
 ITS-8554-kFreeBSD-is-like-BSD.patch
+ITS-8644-wait-for-slapd-to-start-in-test064.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openldap/openldap.git