From: Jong Hyuk Choi Date: Wed, 22 Oct 2003 21:48:56 +0000 (+0000) Subject: checking ldapmodify return code & replace member with uniquemember. X-Git-Tag: OPENLDAP_REL_ENG_2_1_MP~502 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76a4567520912f8b50574bf2ce9fd7d27f262f11;p=openldap checking ldapmodify return code & replace member with uniquemember. --- diff --git a/tests/scripts/test017-syncreplication-refresh b/tests/scripts/test017-syncreplication-refresh index eab3af6f23..a9a1cebc31 100755 --- a/tests/scripts/test017-syncreplication-refresh +++ b/tests/scripts/test017-syncreplication-refresh @@ -121,13 +121,13 @@ drink: Mad Dog 20/20 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US changetype: modify -delete: member -member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +delete: uniquemember +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US - -add: member -member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +add: uniquemember +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US changetype: modify @@ -173,6 +173,13 @@ changetype: delete EOMODS +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + echo "Waiting 90 seconds for syncrepl to receive changes..." sleep 90 diff --git a/tests/scripts/test018-syncreplication-persist b/tests/scripts/test018-syncreplication-persist index 56783232da..03b72f7abf 100755 --- a/tests/scripts/test018-syncreplication-persist +++ b/tests/scripts/test018-syncreplication-persist @@ -121,13 +121,13 @@ drink: Mad Dog 20/20 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US changetype: modify -delete: member -member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +delete: uniquemember +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US - -add: member -member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +add: uniquemember +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US changetype: modify @@ -173,6 +173,13 @@ changetype: delete EOMODS +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + echo "Waiting 20 seconds for syncrepl to receive changes..." sleep 20 diff --git a/tests/scripts/test019-syncreplication-cascade b/tests/scripts/test019-syncreplication-cascade index 739c61fd4f..3f470be3b7 100755 --- a/tests/scripts/test019-syncreplication-cascade +++ b/tests/scripts/test019-syncreplication-cascade @@ -233,13 +233,13 @@ drink: Mad Dog 20/20 dn: cn=ITD Staff,ou=Groups,o=University of Michigan,c=US changetype: modify -delete: member -member: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US -member: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +delete: uniquemember +uniquemember: cn=James A Jones 2, ou=Information Technology Division, ou=People, o=University of Michigan, c=US +uniquemember: cn=Bjorn Jensen, ou=Information Technology Division, ou=People, o=University of Michigan, c=US - -add: member -member: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US -member: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US +add: uniquemember +uniquemember: cn=Dorothy Stevens, ou=Alumni Association, ou=People, o=University of Michigan, c=US +uniquemember: cn=James A Jones 1, ou=Alumni Association, ou=People, o=University of Michigan, c=US dn: cn=All Staff,ou=Groups,o=University of Michigan,c=US changetype: modify @@ -285,6 +285,13 @@ changetype: delete EOMODS +RC=$? +if test $RC != 0 ; then + echo "ldapmodify failed ($RC)!" + test $KILLSERVERS != no && kill -HUP $KILLPIDS + exit $RC +fi + echo "Waiting 90 seconds for syncrepl to receive changes..." sleep 90