X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=tests%2Fscripts%2Ftest037-manage;h=6c0f533252c9a4fc6270f0fe6106ad35f7cad010;hb=58c0bf5ad12415ac4fde91d4ae39ac883eb28106;hp=84a6d1fc8f360a318493e71bec5aaf78f43705f1;hpb=05b93359f4dd62e862ce29524dece97b6fa43cdf;p=openldap

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index 84a6d1fc8f..6c0f533252 100755
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2007 The OpenLDAP Foundation.
+## Copyright 1998-2011 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -17,7 +17,7 @@ echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
 if test $BACKEND = "ldif" ; then 
-	echo "LDIF backend does not support manageDIT control, test skipped"
+	echo "LDIF backend does not support relax control, test skipped"
 	exit 0
 fi 
 
@@ -130,22 +130,9 @@ createTimestamp: 19700101000000Z
 modifiersName: cn=Someone Else
 modifyTimestamp: 19700101000000Z
 entryUUID: badbadef-dbad-1029-92f7-badbadbadbad
-EOMODS
 
-RC=$?
-if test $RC != 0 ; then
-	echo "ldapmodify failed ($RC)!"
-	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-	exit $RC
-fi
-
-echo "Testing modify, add, and delete..."
-$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
-	-e \!relax > \
-	$TESTOUT 2>&1 << EOMODS
-version: 1
 #
-# Non-working tests
+# Tests that did not work until ITS#5792
 #
 
 dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
@@ -154,9 +141,8 @@ dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
 changetype: modify
 replace: objectClass
 objectClass: obsoletePerson
+objectClass: testPerson
 -
-replace: structuralObjectClass
-structuralObjectClass: testPerson
 
 dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
 # update structural object class of entry via objectClass add
@@ -164,8 +150,6 @@ changetype: modify
 add: objectClass
 objectClass: testPerson
 -
-replace: structuralObjectClass
-structuralObjectClass: testPerson
 
 dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com
 # update structural object class of entry via objectClass delete/add
@@ -176,17 +160,13 @@ objectClass: OpenLDAPperson
 add: objectClass
 objectClass: testPerson
 -
-delete: structuralObjectClass
--
-add: structuralObjectClass
-structuralObjectClass: testPerson
 EOMODS
 
 RC=$?
 if test $RC != 0 ; then
-	echo "ldapmodify failed ($RC)!  IGNORED"
-#	test $KILLSERVERS != no && kill -HUP $KILLPIDS
-#	exit $RC
+	echo "ldapmodify failed ($RC)!"
+	test $KILLSERVERS != no && kill -HUP $KILLPIDS
+	exit $RC
 fi
 
 echo "Using ldapsearch to retrieve all the entries..."
@@ -221,9 +201,9 @@ fi
 LDIF=$MANAGEOUT
 
 echo "Filtering ldapsearch results..."
-. $LDIFFILTER < $SEARCHOUT > $SEARCHFLT
+$LDIFFILTER < $SEARCHOUT > $SEARCHFLT
 echo "Filtering original ldif used to create database..."
-. $LDIFFILTER < $LDIF > $LDIFFLT
+$LDIFFILTER < $LDIF > $LDIFFLT
 echo "Comparing filter output..."
 $CMP $SEARCHFLT $LDIFFLT > $CMPOUT