From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 26 Aug 1999 00:22:05 +0000 (+0000)
Subject: Update test005-modrdn to handle success without entries
X-Git-Tag: TWEB_OL_BASE~111
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=05532e03f9df3fe02b87373ae90f5f95ae5b1cf3;p=openldap

Update test005-modrdn to handle success without entries
---

diff --git a/tests/scripts/test005-modrdn b/tests/scripts/test005-modrdn
index 107d602b8b..5eabb65b36 100755
--- a/tests/scripts/test005-modrdn
+++ b/tests/scripts/test005-modrdn
@@ -74,8 +74,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones III)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-	    'cn=James A Jones III' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-	    > $SEARCHOUT 2>&1
+	    'cn=James A Jones III' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapsearch failed!"
@@ -102,8 +101,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones II)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-	    'cn=James A Jones II' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-	    >  $SEARCHOUT 2>&1
+	    'cn=James A Jones II' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapsearch failed!"
@@ -132,14 +130,19 @@ fi
 
 echo "Using ldapsearch to retrieve entries using removed rdn (cn=James A Jones 2)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-	    'cn=James A Jones 2' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-	    > /dev/null 2>&1
+	    'cn=James A Jones 2' > $SEARCHOUT 2>&1
 RC=$?
-if test $RC = 0 ; then
-	echo "failure: ldapsearch found attribute that was to be removed!"
+if test $RC != 0 ; then
 	kill -HUP $PID
+	echo "ldapsearch failed!"
 	exit $RC
 fi
+cmp $SEARCHOUT /dev/null
+if test $? != 0 ; then
+	echo "failure: ldapsearch found attribute that was to be removed!"
+	kill -HUP $PID
+	exit 1
+fi
 
 echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
@@ -183,8 +186,7 @@ fi
 
 echo "Using ldapsearch to retrieve entries using new rdn (cn=James A Jones 1)..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h localhost -p $PORT \
-	    'cn=James A Jones 1' | egrep -iv '^createtimestamp:|^modifytimestamp:' \
-	    >  $SEARCHOUT 2>&1
+	    'cn=James A Jones 1' > $SEARCHOUT 2>&1
 RC=$?
 if test $RC != 0 ; then
 	echo "ldapsearch failed!"