From: Hallvard Furuseth <hallvard@openldap.org>
Date: Sun, 6 Dec 2009 21:01:45 +0000 (+0000)
Subject: Wait for central master to start after final restart.
X-Git-Tag: ACLCHECK_0~23
X-Git-Url: https://git.sur5r.net/?p=openldap;a=commitdiff_plain;h=1381825003890738ec2afb68401e3ca8129d4d84

Wait for central master to start after final restart.
Narrow tests for failed entry removal: 'RC = success' -> 'rc != noSuchObject'.
---

diff --git a/tests/scripts/test058-syncrepl-asymmetric b/tests/scripts/test058-syncrepl-asymmetric
index 45d27e47d4..cd4ccebdcc 100755
--- a/tests/scripts/test058-syncrepl-asymmetric
+++ b/tests/scripts/test058-syncrepl-asymmetric
@@ -2352,11 +2352,16 @@ EOF
 	for i in 1 2 3 4 5; do
 		$LDAPSEARCH -s base -b "$SUB_DN" -H $URI1 > /dev/null 2>&1
 		RC=$?
-		if test $RC != 0; then break; fi
+		if test $RC = 32; then break; fi
 		sleep $i
 	done
 
-	if test $RC = 0; then
+	if test $RC != 32; then
+		if test $RC != 0; then
+			echo "ldapsearch failed ($RC)!"
+			test $KILLSERVERS != no && kill -HUP $KILLPIDS
+			exit $RC
+		fi
 		echo "ERROR: Entry not removed on central master!"
 		RACE_ERROR=1
 		break
@@ -2371,8 +2376,8 @@ EOF
 		sleep $i
 	done
 
-	if test $RC = 0; then
-		echo "ERROR: Entry not removed on central search!"
+	if test $RC != 32; then
+		echo "ERROR: Entry not removed on central search! (RC=$RC)"
 		RACE_ERROR=1
 		break
 	fi