X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fscripts%2Ftest037-manage;h=f31cd6757d85fcfa05840a1e450aa90a69183521;hb=6d6a4b7ddae7c38bfb231161a12410b925f60646;hp=c31f887220a25c7276ec5726d8889b8aff083d1c;hpb=cd49888bff467b0706c48ae5b785f0472b4059d7;p=openldap

diff --git a/tests/scripts/test037-manage b/tests/scripts/test037-manage
index c31f887220..f31cd6757d 100755
--- a/tests/scripts/test037-manage
+++ b/tests/scripts/test037-manage
@@ -13,9 +13,6 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-echo "skipping test (not yet implemented)"
-exit 0
-
 echo "running defines.sh"
 . $SRCDIR/scripts/defines.sh
 
@@ -58,32 +55,35 @@ if test $RC != 0 ; then
 fi
 
 echo "Testing modify, add, and delete..."
-$LDAPMODIFY -v -MM -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD > \
+$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
+	-e \!manageDIT > \
 	$TESTOUT 2>&1 << EOMODS
 version: 1
+#
+# Working Tests
+#
 
-# LEADING COMMENT AND WHITE SPACE
-
-dn: cn=James A Jones 1,ou=Alumni Association,ou=People,dc=example,dc=com
-# update structural object class of entry via objectClass replace
-changetype: modify
-replace: objectClass
-objectClass: testPerson
+#
+# ObjectClass tests
+#
 
-dn: cn=Bjorn Jensen,ou=Information Technology Division,ou=People,dc=example,dc=com
-# update structural object class of entry via objectClass modify
+dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
+ dc=com
+# add obsolete auxiliary objectclass
 changetype: modify
-delete: objectClass
-objectClass: OpenLDAPperson
--
 add: objectClass
-objectClass: testPerson
+objectClass: obsoletePerson
 
-dn: cn=ITD Staff,ou=Groups,dc=example,dc=com
-# change entryUUID
+dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
+ dc=com
+# add obsolete attribute
 changetype: modify
-replace: entryUUID
-entryUUID: B51EE239-C24A-11D9-A541-000D9342AD1E
+add: testObsolete
+testObsolete: TRUE
+
+#
+# create/modify timestamp test
+#
 
 dn: ou=Groups,dc=example,dc=com
 # change creatorsName
@@ -106,9 +106,60 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
+echo "Testing modify, add, and delete..."
+$LDAPMODIFY -v -D "$MANAGERDN" -h $LOCALHOST -p $PORT1 -w $PASSWD \
+	-e \!manageDIT > \
+	$TESTOUT 2>&1 << EOMODS
+version: 1
+#
+# Non-working tests
+#
+
+dn: cn=Barbara Jensen,ou=Information Technology Division,ou=People,dc=example,
+ dc=com
+# update structural object class of entry via objectClass replace
+changetype: modify
+replace: objectClass
+objectClass: obsoletePerson
+-
+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
+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
+changetype: modify
+delete: objectClass
+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
+fi
+
 echo "Using ldapsearch to retrieve all the entries..."
 $LDAPSEARCH -S "" -b "$BASEDN" -h $LOCALHOST -p $PORT1 \
-	    'objectClass=*' > $SEARCHOUT 2>&1
+    'objectClass=*' '*' creatorsName modifiersName > $SEARCHOUT 2>&1
 RC=$?
 test $KILLSERVERS != no && kill -HUP $KILLPIDS
 if test $RC != 0 ; then
@@ -116,7 +167,7 @@ if test $RC != 0 ; then
 	exit $RC
 fi
 
-LDIF=$MODIFYOUTMASTER
+LDIF=$MANAGEOUT
 
 echo "Filtering ldapsearch results..."
 . $LDIFFILTER < $SEARCHOUT > $SEARCHFLT