From 3fc02ee0f64fbba7615a0a9948cc5c011a3896bc Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Fri, 01 Jun 2007 20:35:30 +0000
Subject: [PATCH] Adjusted some of the test cases for inheritance with ACI bind rules. Finishes off Issue 1600.
---
opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif | 2 --
opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml | 30 +-----------------------------
2 files changed, 1 insertions(+), 31 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif b/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
index 6fcc337..1f5304b 100644
--- a/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
+++ b/opends/tests/functional-tests/shared/data/aci/aci_bindtypes/aci_startup_bindtypes.ldif
@@ -160,7 +160,6 @@
ou: Accounting
ou: People
l: Sunnyvale
-manager: uid=amanager, ou=People, o=ACI Tests, dc=example,dc=com
uid: dmillerone
mail: dmillerone@example.com
telephonenumber: +1 408 555 9423
@@ -183,7 +182,6 @@
ou: Accounting
ou: People
l: Sunnyvale
-manager: uid=amanager, ou=People, o=ACI Tests, dc=example,dc=com
uid: dmillertwo
mail: dmillertwo@example.com
telephonenumber: +1 408 555 9423
diff --git a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 3e7e170..f79f20e 100755
--- a/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -4374,7 +4374,6 @@
<tcstatus result="'fail'"/>
</if>
-<!-- The rest of the test case should be uncommented when Issue 1600 is resolved.
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, user searching in second child level'
</message>
@@ -4402,7 +4401,7 @@
<if expr="returnCode != '0'">
<tcstatus result="'fail'"/>
</if>
--->
+
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, admin deleting aci'
</message>
@@ -4575,15 +4574,6 @@
<tcstatus result="'fail'"/>
</if>
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'manager:' }
- </call>
-
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow one child level, user searching in second child level'
</message>
@@ -4783,15 +4773,6 @@
<tcstatus result="'fail'"/>
</if>
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'manager:' }
- </call>
-
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow two child levels, user searching in second child level'
</message>
@@ -4829,15 +4810,6 @@
<tcstatus result="'fail'"/>
</if>
- <call function="'searchStringForSubstring'">
- { 'returnString' : returnString ,
- 'testString' : 'manager:' }
- </call>
-
- <if expr="returnCode != '1'">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow two child levels, admin deleting aci'
</message>
--
Gitblit v1.10.0