From 3872ee862e24c3eb0801975a9943ef7df2ffe022 Mon Sep 17 00:00:00 2001
From: mkeyes <mkeyes@localhost>
Date: Mon, 30 Jul 2007 20:42:12 +0000
Subject: [PATCH] Removed an ACI test suite that has been obsoleted with recent upgrades to the ACI test suites.
---
/dev/null | 129 -------------------------------------------
opends/tests/functional-tests/testcases/aci/aci.xml | 4 -
2 files changed, 0 insertions(+), 133 deletions(-)
diff --git a/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif b/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif
deleted file mode 100644
index f542d33..0000000
--- a/opends/tests/functional-tests/shared/data/aci/aci_disable.ldif
+++ /dev/null
@@ -1,6 +0,0 @@
-dn: cn=Access Control Handler,cn=config
-changetype: modify
-replace: ds-cfg-acl-handler-enabled
-ds-cfg-acl-handler-enabled: false
-
-
diff --git a/opends/tests/functional-tests/testcases/aci/aci.xml b/opends/tests/functional-tests/testcases/aci/aci.xml
index 5398f50..8c8ea59 100755
--- a/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -117,10 +117,6 @@
file="'%s/testcases/aci/aci_import.xml' % (TESTS_DIR)"/>
<call function="'aci_import'" />
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
- <call function="'aci_teardown'" />
-
<call function="'testGroup_Postamble'"/>
diff --git a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml b/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
deleted file mode 100755
index a5e40e2..0000000
--- a/opends/tests/functional-tests/testcases/aci/aci_teardown.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE stax SYSTEM "../../shared/stax.dtd">
-<!--
- ! CDDL HEADER START
- !
- ! The contents of this file are subject to the terms of the
- ! Common Development and Distribution License, Version 1.0 only
- ! (the "License"). You may not use this file except in compliance
- ! with the License.
- !
- ! You can obtain a copy of the license at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE
- ! or https://OpenDS.dev.java.net/OpenDS.LICENSE.
- ! See the License for the specific language governing permissions
- ! and limitations under the License.
- !
- ! When distributing Covered Code, include this CDDL HEADER in each
- ! file and include the License file at
- ! trunk/opends/resource/legal-notices/OpenDS.LICENSE. If applicable,
- ! add the following below this CDDL HEADER, with the fields enclosed
- ! by brackets "[]" replaced with your own identifying information:
- ! Portions Copyright [yyyy] [name of copyright owner]
- !
- ! CDDL HEADER END
- !
- ! Portions Copyright 2007 Sun Microsystems, Inc.
- ! -->
-<stax>
-
- <defaultcall function="aci_teardown"/>
-
- <function name="aci_teardown">
-
- <sequence>
-
- <block name="'teardown'">
-
- <sequence>
-
- <script>
- if not CurrentTestPath.has_key('group'):
- CurrentTestPath['group']='aci'
- CurrentTestPath['suite']=STAXCurrentBlock
- </script>
-
- <call function="'testSuite_Preamble'"/>
-
- <!---
- Place group-specific test information here.
- #@TestGroupName ACI
- #@TestGroupPurpose To test the ACI functionality.
-
- Place suite-specific test information here.
- #@TestSuiteName ACI Teardown Tests
- #@TestSuitePurpose Unconfigure OpenDS after testing ACI functionality.
- #@TestSuiteGroup ACI Teardown Tests
- #@TestScript aci_teardown.xml
- -->
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
-
- <!--- Test Case : Remove Entries for ACI Tests -->
- <!---
- Place test-specific test information here.
- The tag, TestMarker, must be the same as the tag, TestSuiteName.
- #@TestMarker ACI Teardown Tests
- #@TestName ACI Teardown Test
- #@TestIssue none
- #@TestPurpose Remove entries that were needed for the ACI tests.
- #@TestPreamble none
- #@TestStep Disable ACI with ldapmodify.
- #@TestStep Remove entries.
- #@TestPostamble none
- #@TestResult Success if OpenDS returns 0 for all operations
- -->
- <testcase name="'ACI: ACI Teardown: Remove Initial Entries'">
- <sequence>
- <call function="'testCase_Preamble'"/>
- <message>
- 'ACI: ACI Teardown: Disabling ACI'
- </message>
-
- <call function="'modifyEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeModified' : '%s/aci/aci_disable.ldif' % logsRemoteDataDir }
- </call>
-
- <message>
- 'ACI: ACI Teardown: Removing Initial Entries'
- </message>
-
- <call function="'DeleteEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'o=ACI Tests,dc=example,dc=com' ,
- 'extraParams' : '-x'}
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
- </testcase>
-
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_cleanup.xml' % (TESTS_DIR)"/>
- <call function="'aci_cleanup'" />
-
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
-
- </block>
-
- </sequence>
-
- </function>
-
-</stax>
--
Gitblit v1.10.0