From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java | 4
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java | 36
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java | 2
opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml | 3
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14a.ldif | 4
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-9.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml | 35
opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml | 262 --
opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml | 227 -
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml | 6
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21a.ldif | 9
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml | 49
opends/tests/staf-tests/shared/ant/opends.xml | 2
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml | 43
opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml | 2484 +++++++++++++++++++
opends/tests/staf-tests/shared/functions/environment.xml | 128
opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml | 54
opends/src/admin/messages/LDAPConnectionHandlerCfgDefn.properties | 2
opends/src/admin/messages/PluginCfgDefn.properties | 2
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml | 6
opends/src/admin/messages/ProfilerPluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml | 47
opends/src/admin/messages/ParallelWorkQueueCfgDefn.properties | 8
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml | 199 -
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-8.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml | 23
opends/src/admin/messages/ChangeNumberControlPluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml | 57
opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java | 2
opends/src/admin/messages/LDAPAttributeDescriptionListPluginCfgDefn.properties | 2
opends/src/admin/messages/SevenBitCleanPluginCfgDefn.properties | 2
opends/src/server/org/opends/server/backends/jeb/EntryContainer.java | 51
opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml | 12
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-11.ldif | 8
opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java | 9
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml | 55
opends/src/server/org/opends/server/crypto/CryptoManagerSync.java | 22
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21b.ldif | 15
opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml | 43
opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml | 7
opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java | 11
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml | 6
opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java | 31
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml | 6
opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java | 5
opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml | 11
opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java | 5
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16a.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml | 27
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml | 31
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml | 6
opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml | 147 +
opends/src/admin/messages/PluginRootCfgDefn.properties | 6
opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml | 5
opends/tests/staf-tests/shared/ant/build.properties | 7
opends/src/server/org/opends/server/replication/service/ReplicationBroker.java | 15
opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml | 119
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-12.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml | 116
opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml | 92
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-15.ldif | 17
opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml | 131 -
opends/src/admin/messages/FileBasedAccessLogPublisherCfgDefn.properties | 1
opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml | 49
opends/src/admin/messages/EntryUUIDPluginCfgDefn.properties | 2
opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 10
opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml | 6
opends/src/quicksetup/org/opends/quicksetup/UserData.java | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml | 98
opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml | 35
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14b.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml | 6
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-4.ldif | 8
opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml | 2
opends/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java | 172 +
opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml | 230 -
opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java | 5
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-7.ldif | 17
opends/src/admin/messages/ReplicationDomainCfgDefn.properties | 2
opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java | 2
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20b.ldif | 16
opends/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java | 4
opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml | 7
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_collectiveattr.ldif | 4
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml | 31
opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java | 49
opends/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml | 218 -
opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml | 106
opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl | 7
opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java | 10
opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java | 12
opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml | 14
opends/tests/staf-tests/shared/functions/dsadm.xml | 57
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml | 19
opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java | 5
opends/src/server/org/opends/server/tools/InstallDS.java | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml | 316 --
opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml | 35
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-5.ldif | 4
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml | 27
opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml | 27
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16b.ldif | 15
opends/tests/staf-tests/shared/functions/tools.xml | 11
opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml | 176 +
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml | 31
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-17.ldif | 8
opends/tests/staf-tests/shared/tests/runTests.xml | 70
opends/src/admin/messages/NetworkGroupPluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18a.ldif | 9
opends/tests/staf-tests/shared/ant/build.xml | 4
opends/src/admin/messages/ReplicationServerCfgDefn.properties | 8
opends/tests/staf-tests/shared/java/ldapjdk/Writer.java | 1
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20a.ldif | 9
opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java | 4
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml | 31
opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml | 6
opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java | 10
opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml | 6
opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml | 6
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-19.ldif | 9
opends/src/admin/messages/PasswordPolicyImportPluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml | 47
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java | 9
opends/tests/staf-tests/shared/ant/tests.xml | 31
opends/tests/staf-tests/shared/functions/topology.xml | 63
opends/src/admin/messages/UniqueAttributePluginCfgDefn.properties | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml | 19
opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java | 23
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml | 47
opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml | 122
opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml | 6
opends/src/admin/messages/ExternalChangelogDomainCfgDefn.properties | 6
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml | 15
opends/src/admin/messages/LastModPluginCfgDefn.properties | 2
opends/tests/staf-tests/shared/tests/config.py.stubs | 8
opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java | 6
opends/src/admin/messages/CollectiveAttributeSubentriesVirtualAttributeCfgDefn.properties | 19
opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18b.ldif | 16
opends/tests/staf-tests/shared/functions/utils.xml | 101
opends/src/admin/messages/FractionalLDIFImportPluginCfgDefn.properties | 2
opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java | 3
opends/tests/staf-tests/shared/tests/runTestJob.xml | 31
opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml | 180 -
opends/src/server/org/opends/server/tools/EncodePassword.java | 18
opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java | 30
opends/tests/staf-tests/shared/xsl/id.xsl | 14
151 files changed, 4,137 insertions(+), 3,506 deletions(-)
diff --git a/opends/src/admin/messages/ChangeNumberControlPluginCfgDefn.properties b/opends/src/admin/messages/ChangeNumberControlPluginCfgDefn.properties
index c41521e..0bee311 100644
--- a/opends/src/admin/messages/ChangeNumberControlPluginCfgDefn.properties
+++ b/opends/src/admin/messages/ChangeNumberControlPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/CollectiveAttributeSubentriesVirtualAttributeCfgDefn.properties b/opends/src/admin/messages/CollectiveAttributeSubentriesVirtualAttributeCfgDefn.properties
new file mode 100644
index 0000000..1d6b102
--- /dev/null
+++ b/opends/src/admin/messages/CollectiveAttributeSubentriesVirtualAttributeCfgDefn.properties
@@ -0,0 +1,19 @@
+user-friendly-name=Collective Attribute Subentries Virtual Attribute
+user-friendly-plural-name=Collective Attribute Subentries Virtual Attributes
+synopsis=The Collective Attribute Subentries Virtual Attribute generates a virtual attribute that specifies all collective attribute subentries that affect the entry.
+property.attribute-type.synopsis=Specifies the attribute type for the attribute whose values are to be dynamically assigned by the virtual attribute.
+property.base-dn.synopsis=Specifies the base DNs for the branches containing entries that are eligible to use this virtual attribute.
+property.base-dn.description=If no values are given, then the server generates virtual attributes anywhere in the server.
+property.base-dn.default-behavior.alias.synopsis=The location of the entry in the server is not taken into account when determining whether an entry is eligible to use this virtual attribute.
+property.conflict-behavior.synopsis=Specifies the behavior that the server is to exhibit for entries that already contain one or more real values for the associated attribute.
+property.conflict-behavior.syntax.enumeration.value.merge-real-and-virtual.synopsis=Indicates that the virtual attribute provider is to preserve any real values contained in the entry and merge them with the set of generated virtual values so that both the real and virtual values are used.
+property.conflict-behavior.syntax.enumeration.value.real-overrides-virtual.synopsis=Indicates that any real values contained in the entry are preserved and used, and virtual values are not generated.
+property.conflict-behavior.syntax.enumeration.value.virtual-overrides-real.synopsis=Indicates that the virtual attribute provider suppresses any real values contained in the entry and generates virtual values and uses them.
+property.enabled.synopsis=Indicates whether the Collective Attribute Subentries Virtual Attribute is enabled for use.
+property.filter.synopsis=Specifies the search filters to be applied against entries to determine if the virtual attribute is to be generated for those entries.
+property.filter.description=If no values are given, then any entry is eligible to have the value generated. If one or more filters are specified, then only entries that match at least one of those filters are allowed to have the virtual attribute.
+property.filter.syntax.string.pattern.synopsis=Any valid search filter string.
+property.group-dn.synopsis=Specifies the DNs of the groups whose members can be eligible to use this virtual attribute.
+property.group-dn.description=If no values are given, then group membership is not taken into account when generating the virtual attribute. If one or more group DNs are specified, then only members of those groups are allowed to have the virtual attribute.
+property.group-dn.default-behavior.alias.synopsis=Group membership is not taken into account when determining whether an entry is eligible to use this virtual attribute.
+property.java-class.synopsis=Specifies the fully-qualified name of the virtual attribute provider class that generates the attribute values.
diff --git a/opends/src/admin/messages/EntryUUIDPluginCfgDefn.properties b/opends/src/admin/messages/EntryUUIDPluginCfgDefn.properties
index ec32bb8..7dc5d3a 100644
--- a/opends/src/admin/messages/EntryUUIDPluginCfgDefn.properties
+++ b/opends/src/admin/messages/EntryUUIDPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/ExternalChangelogDomainCfgDefn.properties b/opends/src/admin/messages/ExternalChangelogDomainCfgDefn.properties
new file mode 100644
index 0000000..9352278
--- /dev/null
+++ b/opends/src/admin/messages/ExternalChangelogDomainCfgDefn.properties
@@ -0,0 +1,6 @@
+user-friendly-name=External Changelog Domain
+user-friendly-plural-name=External Changelog Domains
+synopsis=The External Changelog Domain provides configuration of the external changelog for the replication domain.
+property.ecl-include.synopsis=Allows to include some target entry attributes in the external changelog.
+property.ecl-include.description=Specifies an attribute that will be included in every External Change Log entry related to this replication domain.
+property.enabled.synopsis=Indicates whether the External Changelog Domain is enabled.
diff --git a/opends/src/admin/messages/FileBasedAccessLogPublisherCfgDefn.properties b/opends/src/admin/messages/FileBasedAccessLogPublisherCfgDefn.properties
index ce70eb7..30cd2fe 100644
--- a/opends/src/admin/messages/FileBasedAccessLogPublisherCfgDefn.properties
+++ b/opends/src/admin/messages/FileBasedAccessLogPublisherCfgDefn.properties
@@ -13,6 +13,7 @@
property.log-file-permissions.synopsis=The UNIX permissions of the log files created by this File Based Access Log Publisher.
property.log-file-permissions.syntax.string.pattern.synopsis=A valid UNIX mode string. The mode string must contain three digits between zero and seven.
property.queue-size.synopsis=The maximum number of log records that can be stored in the asynchronous queue.
+property.queue-size.description=Setting the queue size to zero activates parallel log writer implementation which has no queue size limit and as such the parallel log writer should only be used on a very well tuned server configuration to avoid potential out of memory errors.
property.queue-size.requires-admin-action.synopsis=The File Based Access Log Publisher must be restarted if this property is changed and the asynchronous property is set to true.
property.retention-policy.synopsis=The retention policy to use for the File Based Access Log Publisher .
property.retention-policy.description=When multiple policies are used, log files are cleaned when any of the policy's conditions are met.
diff --git a/opends/src/admin/messages/FractionalLDIFImportPluginCfgDefn.properties b/opends/src/admin/messages/FractionalLDIFImportPluginCfgDefn.properties
index d647ab4..dec2887 100644
--- a/opends/src/admin/messages/FractionalLDIFImportPluginCfgDefn.properties
+++ b/opends/src/admin/messages/FractionalLDIFImportPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/LDAPAttributeDescriptionListPluginCfgDefn.properties b/opends/src/admin/messages/LDAPAttributeDescriptionListPluginCfgDefn.properties
index 0146563..44de0e4 100644
--- a/opends/src/admin/messages/LDAPAttributeDescriptionListPluginCfgDefn.properties
+++ b/opends/src/admin/messages/LDAPAttributeDescriptionListPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/LDAPConnectionHandlerCfgDefn.properties b/opends/src/admin/messages/LDAPConnectionHandlerCfgDefn.properties
index 706b054..5b0d4db 100644
--- a/opends/src/admin/messages/LDAPConnectionHandlerCfgDefn.properties
+++ b/opends/src/admin/messages/LDAPConnectionHandlerCfgDefn.properties
@@ -17,6 +17,8 @@
property.allow-start-tls.description=If enabled, the LDAP Connection Handler allows clients to use the StartTLS extended operation to initiate secure communication over an otherwise insecure channel. Note that this is only allowed if the LDAP Connection Handler is not configured to use SSL, and if the server is configured with a valid key manager provider and a valid trust manager provider.
property.allow-tcp-reuse-address.synopsis=Indicates whether the LDAP Connection Handler should reuse socket descriptors.
property.allow-tcp-reuse-address.description=If enabled, the SO_REUSEADDR socket option is used on the server listen socket to potentially allow the reuse of socket descriptors for clients in a TIME_WAIT state. This may help the server avoid temporarily running out of socket descriptors in cases in which a very large number of short-lived connections have been established from the same client system.
+property.buffer-size.synopsis=Specifies the size in bytes of the LDAP response message write buffer.
+property.buffer-size.description=This property specifies write buffer size allocated by the server for each client connection and used to buffer LDAP response messages data when writing.
property.denied-client.synopsis=Specifies a set of host names or address masks that determine the clients that are not allowed to establish connections to this LDAP Connection Handler.
property.denied-client.description=Valid values include a host name, a fully qualified domain name, a domain name, an IP address, or a subnetwork with subnetwork mask. If both allowed and denied client masks are defined and a client connection matches one or more masks in both lists, then the connection is denied. If only a denied list is specified, then any client not matching a mask in that list is allowed.
property.denied-client.default-behavior.alias.synopsis=If an allow list is specified, then only clients with addresses on the allow list are allowed. Otherwise, all clients are allowed.
diff --git a/opends/src/admin/messages/LastModPluginCfgDefn.properties b/opends/src/admin/messages/LastModPluginCfgDefn.properties
index d5dfca2..3080f98 100644
--- a/opends/src/admin/messages/LastModPluginCfgDefn.properties
+++ b/opends/src/admin/messages/LastModPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/NetworkGroupPluginCfgDefn.properties b/opends/src/admin/messages/NetworkGroupPluginCfgDefn.properties
index a2433e2..a9a8b5e 100644
--- a/opends/src/admin/messages/NetworkGroupPluginCfgDefn.properties
+++ b/opends/src/admin/messages/NetworkGroupPluginCfgDefn.properties
@@ -10,6 +10,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/ParallelWorkQueueCfgDefn.properties b/opends/src/admin/messages/ParallelWorkQueueCfgDefn.properties
new file mode 100644
index 0000000..d4a303c
--- /dev/null
+++ b/opends/src/admin/messages/ParallelWorkQueueCfgDefn.properties
@@ -0,0 +1,8 @@
+user-friendly-name=Parallel Work Queue
+user-friendly-plural-name=Parallel Work Queues
+synopsis=The Parallel Work Queue is a type of work queue that uses a number of worker threads that watch a queue and pick up an operation to process whenever one becomes available.
+description=The parallel work queue is a FIFO queue serviced by a fixed number of worker threads. This fixed number of threads can be changed on the fly, with the change taking effect as soon as it is made. This work queue implementation is unbound ie it does not block after reaching certain queue size and as such should only be used on a very well tuned server configuration to avoid potential out of memory errors.
+property.java-class.synopsis=Specifies the fully-qualified name of the Java class that provides the Parallel Work Queue implementation.
+property.num-worker-threads.synopsis=Specifies the number of worker threads to be used for processing operations placed in the queue.
+property.num-worker-threads.description=If the value is increased, the additional worker threads are created immediately. If the value is reduced, the appropriate number of threads are destroyed as operations complete processing.
+property.num-worker-threads.default-behavior.alias.synopsis=Let the server decide.
diff --git a/opends/src/admin/messages/PasswordPolicyImportPluginCfgDefn.properties b/opends/src/admin/messages/PasswordPolicyImportPluginCfgDefn.properties
index 40915e8..d57f754 100644
--- a/opends/src/admin/messages/PasswordPolicyImportPluginCfgDefn.properties
+++ b/opends/src/admin/messages/PasswordPolicyImportPluginCfgDefn.properties
@@ -15,6 +15,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/PluginCfgDefn.properties b/opends/src/admin/messages/PluginCfgDefn.properties
index f69ef4c..12ef5b4 100644
--- a/opends/src/admin/messages/PluginCfgDefn.properties
+++ b/opends/src/admin/messages/PluginCfgDefn.properties
@@ -9,6 +9,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/PluginRootCfgDefn.properties b/opends/src/admin/messages/PluginRootCfgDefn.properties
index d15ac52..95b0e64 100644
--- a/opends/src/admin/messages/PluginRootCfgDefn.properties
+++ b/opends/src/admin/messages/PluginRootCfgDefn.properties
@@ -11,6 +11,12 @@
property.plugin-order-ldif-import.synopsis=Specifies the order in which LDIF import plug-ins are to be loaded and invoked.
property.plugin-order-ldif-import.description=The value is a comma-delimited list of plug-in names (where the plug-in name is the RDN value from the plug-in configuration entry DN). The list can include at most one asterisk to indicate the position of any unspecified plug-in (and the relative order of those unspecified plug-ins is undefined).
property.plugin-order-ldif-import.default-behavior.alias.synopsis=The order in which LDIF import plug-ins are loaded and invoked is undefined.
+property.plugin-order-ldif-import-begin.synopsis=Specifies the order in which LDIF import begin plug-ins are to be loaded and invoked.
+property.plugin-order-ldif-import-begin.description=The value is a comma-delimited list of plug-in names (where the plug-in name is the RDN value from the plug-in configuration entry DN). The list can include at most one asterisk to indicate the position of any unspecified plug-in (and the relative order of those unspecified plug-ins is undefined).
+property.plugin-order-ldif-import-begin.default-behavior.alias.synopsis=The order in which LDIF import begin plug-ins are loaded and invoked is undefined.
+property.plugin-order-ldif-import-end.synopsis=Specifies the order in which LDIF import end plug-ins are to be loaded and invoked.
+property.plugin-order-ldif-import-end.description=The value is a comma-delimited list of plug-in names (where the plug-in name is the RDN value from the plug-in configuration entry DN). The list can include at most one asterisk to indicate the position of any unspecified plug-in (and the relative order of those unspecified plug-ins is undefined).
+property.plugin-order-ldif-import-end.default-behavior.alias.synopsis=The order in which LDIF import end plug-ins are loaded and invoked is undefined.
property.plugin-order-post-connect.synopsis=Specifies the order in which post-connect plug-ins are to be loaded and invoked.
property.plugin-order-post-connect.description=The value is a comma-delimited list of plug-in names (where the plug-in name is the RDN value from the plug-in configuration entry DN). The list can include at most one asterisk to indicate the position of any unspecified plug-in (and the relative order of those unspecified plug-ins is undefined).
property.plugin-order-post-connect.default-behavior.alias.synopsis=The order in which post-connect plug-ins are loaded and invoked is undefined.
diff --git a/opends/src/admin/messages/ProfilerPluginCfgDefn.properties b/opends/src/admin/messages/ProfilerPluginCfgDefn.properties
index 08406af..7c55b1e 100644
--- a/opends/src/admin/messages/ProfilerPluginCfgDefn.properties
+++ b/opends/src/admin/messages/ProfilerPluginCfgDefn.properties
@@ -11,6 +11,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties b/opends/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
index a9ad4c0..1c4a9fe 100644
--- a/opends/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
+++ b/opends/src/admin/messages/ReferentialIntegrityPluginCfgDefn.properties
@@ -17,6 +17,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/ReplicationDomainCfgDefn.properties b/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
index 8c85d85..18bb675 100644
--- a/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
+++ b/opends/src/admin/messages/ReplicationDomainCfgDefn.properties
@@ -37,3 +37,5 @@
property.solve-conflicts.synopsis=Indicates if this server solves conflict.
property.solve-conflicts.description=This boolean indicates if this domain keeps the historical information necessary to solve conflicts. When set to false the server will not maintain historical information and will therefore not be able to solve conflict. This should therefore be done only if the replication is used in a single master type of deployment.
property.window-size.synopsis=Specifies the window size that the Directory Server will use when communicating with Replication Servers.
+relation.external-changelog-domain.user-friendly-name=External Changelog Domain
+relation.external-changelog-domain.synopsis=The External Changelog Domain provides configuration of the external changelog for the replication domain.
diff --git a/opends/src/admin/messages/ReplicationServerCfgDefn.properties b/opends/src/admin/messages/ReplicationServerCfgDefn.properties
index c1f6b44..2122dc7 100644
--- a/opends/src/admin/messages/ReplicationServerCfgDefn.properties
+++ b/opends/src/admin/messages/ReplicationServerCfgDefn.properties
@@ -1,12 +1,14 @@
user-friendly-name=Replication Server
user-friendly-plural-name=Replication Servers
synopsis=Replication Servers publish updates to Directory Servers within a Replication Domain.
-property.assured-timeout.synopsis=The timeout value when waiting for assured mode acknowledgements.
-property.assured-timeout.description=Defines the amount of milliseconds the replication server will wait for assured acknowledgements (in either Safe Data or Safe Read assured sub modes) before forgetting them and answer to the entity that sent an update and is waiting for acknowledgment.
+property.assured-timeout.synopsis=The timeout value when waiting for assured mode acknowledgments.
+property.assured-timeout.description=Defines the number of milliseconds that the replication server will wait for assured acknowledgments (in either Safe Data or Safe Read assured sub modes) before forgetting them and answer to the entity that sent an update and is waiting for acknowledgment.
property.degraded-status-threshold.synopsis=The number of pending changes as threshold value for putting a directory server in degraded status.
property.degraded-status-threshold.description=This value represents a number of pending changes a replication server has in queue for sending to a directory server. Once this value is crossed, the matching directory server goes in degraded status. When number of pending changes goes back under this value, the directory server is put back in normal status. 0 means status analyzer is disabled and directory servers are never put in degraded status.
property.group-id.synopsis=The group id for the replication server.
property.group-id.description=This value defines the group id of the replication server. The replication system of a LDAP server uses the group id of the replicated domain and tries to connect, if possible, to a replication with the same group id.
+property.monitoring-period.synopsis=The period between sending of monitoring messages.
+property.monitoring-period.description=Defines the number of milliseconds that the replication server will wait before sending new monitoring messages to its peers (replication servers and directory servers).
property.queue-size.synopsis=Specifies the number of changes that are kept in memory for each Directory Server in the Replication Domain.
property.replication-db-directory.synopsis=The path where the Replication Server stores all persistent information.
property.replication-port.synopsis=The port on which this Replication Server waits for connections from other Replication Servers or Directory Servers.
@@ -16,4 +18,6 @@
property.replication-server.syntax.string.pattern.synopsis=A host name followed by a ":" and a port number.
property.replication-server-id.synopsis=Specifies a unique identifier for the Replication Server.
property.replication-server-id.description=Each Replication Server must have a different server ID.
+property.weight.synopsis=The weight of the replication server.
+property.weight.description=The weight affected to the replication server. Each replication server of the topology has a weight. When combined together, the weights of the replication servers of a same group can be translated to a percentage that determines the quantity of directory servers of the topology that should be connected to a replication server. For instance imagine a topology with 3 replication servers (with the same group id) with the following weights: RS1=1, RS2=1, RS3=2. This means that RS1 should have 25% of the directory servers connected in the topology, RS2 25%, and RS3 50%. This may be useful if the replication servers of the topology have a different power and one wants to spread the load between the replication servers according to their power.
property.window-size.synopsis=Specifies the window size that the Replication Server uses when communicating with other Replication Servers.
diff --git a/opends/src/admin/messages/SevenBitCleanPluginCfgDefn.properties b/opends/src/admin/messages/SevenBitCleanPluginCfgDefn.properties
index 37ea266..469cc2f 100644
--- a/opends/src/admin/messages/SevenBitCleanPluginCfgDefn.properties
+++ b/opends/src/admin/messages/SevenBitCleanPluginCfgDefn.properties
@@ -14,6 +14,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/admin/messages/UniqueAttributePluginCfgDefn.properties b/opends/src/admin/messages/UniqueAttributePluginCfgDefn.properties
index 2175a98..97052f4 100644
--- a/opends/src/admin/messages/UniqueAttributePluginCfgDefn.properties
+++ b/opends/src/admin/messages/UniqueAttributePluginCfgDefn.properties
@@ -12,6 +12,8 @@
property.plugin-type.syntax.enumeration.value.intermediateresponse.synopsis=Invoked before sending an intermediate repsonse message to the client.
property.plugin-type.syntax.enumeration.value.ldifexport.synopsis=Invoked for each operation to be written during an LDIF export.
property.plugin-type.syntax.enumeration.value.ldifimport.synopsis=Invoked for each entry read during an LDIF import.
+property.plugin-type.syntax.enumeration.value.ldifimportbegin.synopsis=Invoked at the beginning of an LDIF import session.
+property.plugin-type.syntax.enumeration.value.ldifimportend.synopsis=Invoked at the end of an LDIF import session.
property.plugin-type.syntax.enumeration.value.postconnect.synopsis=Invoked whenever a new connection is established to the server.
property.plugin-type.syntax.enumeration.value.postdisconnect.synopsis=Invoked whenever an existing connection is terminated (by either the client or the server).
property.plugin-type.syntax.enumeration.value.postoperationabandon.synopsis=Invoked after completing the abandon processing.
diff --git a/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java b/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
index 3dd5b66..4f21c2d 100644
--- a/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
+++ b/opends/src/dsml/org/opends/dsml/protocol/DSMLServlet.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2008 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.dsml.protocol;
@@ -128,7 +128,8 @@
port = new Integer(config.getServletContext().getInitParameter(PORT));
if(jaxbContext==null)
- jaxbContext = JAXBContext.newInstance(PKG_NAME);
+ jaxbContext = JAXBContext.newInstance(PKG_NAME,
+ this.getClass().getClassLoader());
// assign the DSMLv2 schema for validation
if(schema==null)
{
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
index 778b8e8..045b026 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanel.java
@@ -41,7 +41,6 @@
import javax.swing.JFrame;
import javax.swing.RootPaneContainer;
import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
import javax.swing.WindowConstants;
import org.opends.guitools.controlpanel.datamodel.ControlPanelInfo;
@@ -54,6 +53,7 @@
import org.opends.messages.AdminToolMessages;
import org.opends.quicksetup.Installation;
import org.opends.messages.Message;
+import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.args.ArgumentException;
@@ -207,34 +207,7 @@
private static void initLookAndFeel() throws Throwable
{
- if (SwingUtilities.isEventDispatchThread())
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- else
- {
- final Throwable[] ts = {null};
- SwingUtilities.invokeAndWait(new Runnable()
- {
- public void run()
- {
- try
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- catch (Throwable t)
- {
- ts[0] = t;
- }
- }
- });
- if (ts[0] != null)
- {
- throw ts[0];
- }
- }
+ UIFactory.initialize();
}
private void updateLocalOrRemotePanel(RootPaneContainer localOrRemote)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 33ba350..1b8bcf1 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel;
@@ -36,11 +36,12 @@
import java.util.logging.Logger;
import javax.swing.SwingUtilities;
-import javax.swing.UIManager;
+import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
import org.opends.guitools.controlpanel.util.ControlPanelLog;
import org.opends.messages.AdminToolMessages;
import org.opends.messages.Message;
+import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.StaticUtils;
@@ -214,35 +215,8 @@
AdminToolMessages.INFO_CONTROL_PANEL_TITLE.get(
DynamicConstants.PRODUCT_NAME), Message.class);
Utils.setMacOSXMenuBar(title);
-
- if (SwingUtilities.isEventDispatchThread())
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- else
- {
- final Throwable[] ts = {null};
- SwingUtilities.invokeAndWait(new Runnable()
- {
- public void run()
- {
- try
- {
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
- }
- catch (Throwable t)
- {
- ts[0] = t;
- }
- }
- });
- if (ts[0] != null)
- {
- throw ts[0];
- }
- }
+ ColorAndFontConstants.initialize();
+ UIFactory.initialize();
}
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
index fe72223..2c9b4b2 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/IndexDescriptor.java
@@ -81,7 +81,7 @@
*/
public int compareTo(AbstractIndexDescriptor o)
{
- return getName().compareTo(o.getName());
+ return getName().toLowerCase().compareTo(o.getName().toLowerCase());
}
/**
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
index fead554..55526ad 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/datamodel/VLVIndexDescriptor.java
@@ -75,7 +75,7 @@
*/
public int compareTo(AbstractIndexDescriptor o)
{
- return getName().compareTo(o.getName());
+ return getName().toLowerCase().compareTo(o.getName().toLowerCase());
}
/**
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java b/opends/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
new file mode 100644
index 0000000..28dba49
--- /dev/null
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/event/ComboKeySelectionManager.java
@@ -0,0 +1,172 @@
+/*
+ * 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
+ *
+ *
+ * Copyright 2010 Sun Microsystems, Inc.
+ */
+package org.opends.guitools.controlpanel.event;
+
+import java.awt.Component;
+import java.awt.Container;
+import java.awt.event.KeyEvent;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.JComboBox;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JComboBox.KeySelectionManager;
+import javax.swing.text.JTextComponent;
+
+/**
+ * A class used to allow the user to type a sequence of characters that will
+ * select automatically an item in the combo box.
+ * Note that there must be one instance of this class per combo box. Two
+ * combo boxes must not share the same ComboKeySelectionManager object and
+ * two ComboKeySelectionManager must not be used by the same combo box.
+ */
+public class ComboKeySelectionManager implements KeySelectionManager
+{
+ private JComboBox combo;
+ private JList list;
+
+ // The String that we are searching.
+ private String lastSearchedString;
+
+ private long lastSearchedTime;
+
+ // The number of milliseconds we wait between types before considering that
+ // the search starts again.
+ private long RESET_BETWEEN_TYPES = 700;
+
+ /**
+ * Default constructor.
+ * @param combo the combo box that is attached to this selection key manager.
+ */
+ public ComboKeySelectionManager(JComboBox combo)
+ {
+ this.combo = combo;
+ list = new JList();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public int selectionForKey(char key, ComboBoxModel model)
+ {
+ int selectedIndex = -1;
+ long currentTime = System.currentTimeMillis();
+ if (key == KeyEvent.VK_BACK_SPACE)
+ {
+ if (lastSearchedString == null)
+ {
+ lastSearchedString = "";
+ }
+ else if (lastSearchedString.length() > 0)
+ {
+ lastSearchedString = lastSearchedString.substring(0,
+ lastSearchedString.length() -1);
+ }
+ else
+ {
+ // Nothing to do.
+ }
+ }
+ else
+ {
+ if (lastSearchedTime + RESET_BETWEEN_TYPES < currentTime)
+ {
+ // Reset the search.
+ lastSearchedString = String.valueOf(key);
+ }
+ else
+ {
+ if (lastSearchedString == null)
+ {
+ lastSearchedString = String.valueOf(key);
+ }
+ else
+ {
+ lastSearchedString += key;
+ }
+ }
+ }
+ lastSearchedTime = currentTime;
+ if (lastSearchedString.length() > 0)
+ {
+ for (int i = 0; i < model.getSize() && selectedIndex == -1; i++)
+ {
+ Object value = model.getElementAt(i);
+ Component comp = combo.getRenderer().getListCellRendererComponent(list,
+ value, i, true, true);
+ String sValue;
+ if (comp instanceof Container)
+ {
+ sValue = getDisplayedStringValue((Container)comp);
+ if (sValue == null)
+ {
+ sValue = "";
+ }
+ else
+ {
+ sValue = sValue.trim();
+ }
+ }
+ else
+ {
+ sValue = String.valueOf(value);
+ }
+ if (sValue.toLowerCase().startsWith(lastSearchedString.toLowerCase()))
+ {
+ selectedIndex = i;
+ }
+ }
+ }
+ return selectedIndex;
+ }
+
+ private String getDisplayedStringValue(Container c)
+ {
+ String sValue = null;
+ if (c instanceof JLabel)
+ {
+ sValue = ((JLabel)c).getText();
+ }
+ else if (c instanceof JTextComponent)
+ {
+ sValue = ((JTextComponent)c).getText();
+ }
+ else
+ {
+ int nCount = c.getComponentCount();
+ for (int i=0 ; i<nCount && sValue == null; i++)
+ {
+ Component child = c.getComponent(i);
+ if (child instanceof Container)
+ {
+ sValue = getDisplayedStringValue((Container)child);
+ }
+ }
+ }
+ return sValue;
+ }
+}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java b/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
index b4a6e42..c135753 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/task/ModifyEntryTask.java
@@ -527,7 +527,10 @@
{
isAttributeInNewRdn =
rdn.getAttributeName(i).equalsIgnoreCase(attrName);
- rdnValue = rdn.getAttributeValue(i);
+ if (isAttributeInNewRdn)
+ {
+ rdnValue = rdn.getAttributeValue(i);
+ }
}
/* Check the attributes of the old DN. If we are renaming them they
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
index 92dcd11..3040957 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/AbstractVLVIndexPanel.java
@@ -72,6 +72,7 @@
import org.opends.guitools.controlpanel.ui.renderer.CustomListCellRenderer;
import org.opends.guitools.controlpanel.ui.renderer.IndexComboBoxCellRenderer;
import org.opends.guitools.controlpanel.ui.renderer.VLVSortOrderRenderer;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.server.admin.DefinedDefaultBehaviorProvider;
@@ -267,15 +268,18 @@
/**
* The list of standard attribute names.
*/
- protected TreeSet<String> standardAttrNames = new TreeSet<String>();
+ protected TreeSet<String> standardAttrNames =
+ new TreeSet<String>(new LowerCaseComparator());
/**
* The list of configuration attribute names.
*/
- protected TreeSet<String> configurationAttrNames = new TreeSet<String>();
+ protected TreeSet<String> configurationAttrNames =
+ new TreeSet<String>(new LowerCaseComparator());
/**
* The list of custom attribute names.
*/
- protected TreeSet<String> customAttrNames = new TreeSet<String>();
+ protected TreeSet<String> customAttrNames =
+ new TreeSet<String>(new LowerCaseComparator());
private int defaultVLVEntryLimitValue;
{
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
index 630af75..f56e526 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/ColorAndFontConstants.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -124,6 +124,7 @@
public static final Color greyBackground = Utilities.isWindows() ?
UIManager.getColor("MenuBar.background") :
UIManager.getColor("Panel.background");
+
/**
* The default border color.
*/
@@ -262,4 +263,11 @@
*/
public static final Font outputFont = Font.decode("Monospaced-PLAIN-12");
+ /**
+ * This method initialize the constants used by this class. It must be called
+ * before other classes modify the UIManager constants.
+ */
+ public static void initialize()
+ {
+ }
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 24de7d0..9db380b 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -735,7 +735,8 @@
}
SortedSet<String> orderedKeys =
- new TreeSet<String>(syntaxNameMap.keySet());
+ new TreeSet<String>(new LowerCaseComparator());
+ orderedKeys.addAll(syntaxNameMap.keySet());
for (String key : orderedKeys)
{
newSyntaxes.add(syntaxNameMap.get(key));
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index e883cf3..4109591 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -83,6 +83,7 @@
import org.opends.guitools.controlpanel.ui.components.TitlePanel;
import org.opends.guitools.controlpanel.ui.renderer.
SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -276,7 +277,8 @@
*/
public int compare(AttributeType attr1, AttributeType attr2)
{
- return attr1.getNameOrOID().compareTo(attr2.getNameOrOID());
+ return attr1.getNameOrOID().toLowerCase().compareTo(
+ attr2.getNameOrOID().toLowerCase());
}
};
attributes.getAvailableListModel().setComparator(comparator);
@@ -587,7 +589,8 @@
ObjectClass oc = schema.getObjectClass(key);
objectClassNameMap.put(oc.getNameOrOID(), oc);
}
- SortedSet<String> orderedKeys = new TreeSet<String>();
+ SortedSet<String> orderedKeys =
+ new TreeSet<String>(new LowerCaseComparator());
orderedKeys.addAll(objectClassNameMap.keySet());
ArrayList<ObjectClass> newParents = new ArrayList<ObjectClass>();
for (String key : orderedKeys)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
index 0510440..cf13289 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -62,6 +62,7 @@
import org.opends.guitools.controlpanel.ui.components.BasicExpander;
import
org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -228,7 +229,8 @@
}
SortedSet<String> orderedKeys =
- new TreeSet<String>(syntaxNameMap.keySet());
+ new TreeSet<String>(new LowerCaseComparator());
+ orderedKeys.addAll(syntaxNameMap.keySet());
for (String key : orderedKeys)
{
newSyntaxes.add(syntaxNameMap.get(key));
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
index 1a41d05..5d841d7 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewGroupPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -300,7 +300,7 @@
errorFound = true;
errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_FOUND.get());
}
- else if (!hasObjectClass(ref, "groupOfURLs"))
+ else if (!hasObjectClass(ref, ServerConstants.OC_GROUP_OF_URLS))
{
errorFound = true;
errors.add(ERR_CTRL_PANEL_REFERENCE_GROUP_NOT_DYNAMIC.get());
@@ -783,7 +783,7 @@
else
{
sb.append("objectClass: ds-virtual-static-group\n");
- sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_URLS+"\n");
+ sb.append("objectClass: "+ServerConstants.OC_GROUP_OF_UNIQUE_NAMES+"\n");
sb.append("ds-target-group-dn: "+referenceGroup.getText().trim());
}
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
index 193af06..de0954a 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/NewObjectClassPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -69,6 +69,7 @@
import org.opends.guitools.controlpanel.ui.components.DoubleAddRemovePanel;
import
org.opends.guitools.controlpanel.ui.renderer.SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -200,7 +201,8 @@
ObjectClass oc = schema.getObjectClass(key);
objectClassNameMap.put(oc.getNameOrOID(), oc);
}
- SortedSet<String> orderedKeys = new TreeSet<String>();
+ SortedSet<String> orderedKeys =
+ new TreeSet<String>(new LowerCaseComparator());
orderedKeys.addAll(objectClassNameMap.keySet());
ArrayList<Object> newParents = new ArrayList<Object>();
for (String key : orderedKeys)
@@ -571,7 +573,8 @@
*/
public int compare(AttributeType attr1, AttributeType attr2)
{
- return attr1.getNameOrOID().compareTo(attr2.getNameOrOID());
+ return attr1.getNameOrOID().toLowerCase().compareTo(
+ attr2.getNameOrOID().toLowerCase());
}
};
attributes.getAvailableListModel().setComparator(comparator);
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 4434817..e88b922 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -93,6 +93,7 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -1335,7 +1336,8 @@
protected void updateSimpleBackendComboBoxModel(final JComboBox combo,
final JLabel lNoBackendsFound, ServerDescriptor desc)
{
- final SortedSet<String> newElements = new TreeSet<String>();
+ final SortedSet<String> newElements =
+ new TreeSet<String>(new LowerCaseComparator());
for (BackendDescriptor backend : desc.getBackends())
{
if (!backend.isConfigBackend())
@@ -1377,7 +1379,8 @@
{
LinkedHashSet<CategorizedComboBoxElement> newElements =
new LinkedHashSet<CategorizedComboBoxElement>();
- SortedSet<String> backendIDs = new TreeSet<String>();
+ SortedSet<String> backendIDs =
+ new TreeSet<String>(new LowerCaseComparator());
HashMap<String, SortedSet<String>> hmBaseDNs =
new HashMap<String, SortedSet<String>>();
@@ -1387,7 +1390,8 @@
{
String backendID = backend.getBackendID();
backendIDs.add(backendID);
- SortedSet<String> baseDNs = new TreeSet<String>();
+ SortedSet<String> baseDNs =
+ new TreeSet<String>(new LowerCaseComparator());
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
try
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
index dff3d5a..5273bf6 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -97,6 +97,7 @@
import org.opends.guitools.controlpanel.datamodel.SortableTableModel;
import org.opends.guitools.controlpanel.datamodel.VLVIndexDescriptor;
import org.opends.guitools.controlpanel.event.ClickTooltipDisplayer;
+import org.opends.guitools.controlpanel.event.ComboKeySelectionManager;
import org.opends.guitools.controlpanel.event.TextComponentFocusListener;
import org.opends.guitools.controlpanel.ui.ColorAndFontConstants;
import org.opends.guitools.controlpanel.ui.components.LabelWithHelpIcon;
@@ -165,6 +166,7 @@
{
combo.setOpaque(false);
}
+ combo.setKeySelectionManager(new ComboKeySelectionManager(combo));
return combo;
}
diff --git a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
index 5285bf9..69c314e 100644
--- a/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
+++ b/opends/src/guitools/org/opends/guitools/uninstaller/UninstallLauncher.java
@@ -69,8 +69,7 @@
public static void main(String[] args) {
try {
QuickSetupLog.initLogFileHandler(
- File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX),
- "org.opends.guitools");
+ File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX));
} catch (Throwable t) {
System.err.println("Unable to initialize log");
diff --git a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
index 3363e4c..fdd325e 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/QuickSetupLog.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup;
@@ -58,11 +58,7 @@
logFile = file;
fileHandler = new FileHandler(logFile.getCanonicalPath());
fileHandler.setFormatter(new SimpleFormatter());
- Logger logger = Logger.getLogger("org.opends.quicksetup");
- logger.addHandler(fileHandler);
- logger = Logger.getLogger("org.opends.admin.ads");
- logger.addHandler(fileHandler);
- logger = Logger.getLogger("org.opends.server.admin.client.cli");
+ Logger logger = Logger.getLogger("org.opends");
logger.addHandler(fileHandler);
disableConsoleLogging();
logger = Logger.getLogger("org.opends.quicksetup");
@@ -83,7 +79,10 @@
initLogFileHandler(file);
Logger logger = Logger.getLogger(packageName);
logger.addHandler(fileHandler);
- logger.setUseParentHandlers(false);
+ if (disableLoggingToConsole())
+ {
+ logger.setUseParentHandlers(false); // disable logging to console
+ }
}
/**
@@ -91,14 +90,11 @@
* output.
*/
static public void disableConsoleLogging() {
- Logger logger = Logger.getLogger("org.opends.quicksetup");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.admin.ads");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.server.tools");
- logger.setUseParentHandlers(false);
- logger = Logger.getLogger("org.opends.server.admin.client.cli");
- logger.setUseParentHandlers(false);
+ if (disableLoggingToConsole())
+ {
+ Logger logger = Logger.getLogger("org.opends");
+ logger.setUseParentHandlers(false);
+ }
}
/**
@@ -127,4 +123,8 @@
return sb.toString();
}
+ private static boolean disableLoggingToConsole()
+ {
+ return !"true".equals(System.getenv("OPENDS_LOG_TO_STDOUT"));
+ }
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/UserData.java b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
index 468978c..2260c03 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/UserData.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/UserData.java
@@ -824,6 +824,7 @@
{
hmJavaArguments = new HashMap<String, JavaArguments>();
int maxMemoryMb = 256;
+ int minMemoryMb = 128;
final int maxMemoryBytes = maxMemoryMb * 1024 * 1024;
// If the current max memory is bigger than the max heap we want to set,
// assume that the JVM ergonomics are going to be able to allocate enough
@@ -832,6 +833,7 @@
if (currentMaxMemoryBytes > maxMemoryBytes)
{
maxMemoryMb = -1;
+ minMemoryMb = -1;
}
for (String clientScript : getClientScripts())
{
@@ -843,8 +845,8 @@
for (String serverScript : getServerScripts())
{
JavaArguments javaArgument = new JavaArguments();
- javaArgument.setInitialMemory(128);
- javaArgument.setMaxMemory(256);
+ javaArgument.setInitialMemory(minMemoryMb);
+ javaArgument.setMaxMemory(maxMemoryMb);
javaArgument.setAdditionalArguments(new String[] {"-server"});
hmJavaArguments.put(serverScript, javaArgument);
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java b/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
index f6170d2..cf6d219 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/SetupLauncher.java
@@ -67,10 +67,7 @@
try {
QuickSetupLog.initLogFileHandler(
File.createTempFile(Constants.LOG_FILE_PREFIX,
- Constants.LOG_FILE_SUFFIX),
- "org.opends.quicksetup.installer");
- QuickSetupLog.disableConsoleLogging();
-
+ Constants.LOG_FILE_SUFFIX));
} catch (Throwable t) {
System.err.println("Unable to initialize log");
t.printStackTrace();
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
index 8d14e7e..67ef7eb 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/RuntimeOptionsPanel.java
@@ -157,14 +157,14 @@
int importInsetsTop = Math.abs(
bImport.getPreferredSize().height -
l.getPreferredSize().height) / 2;
- gbc.insets.top = importInsetsTop;
+ gbc.insets.top = importInsetsTop + UIFactory.TOP_INSET_SECONDARY_FIELD;
panel.add(l, gbc);
gbc.gridx ++;
gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
gbc.weightx = 0.5;
panel.add(lImport, gbc);
gbc.gridx ++;
- gbc.insets.top = 0;
+ gbc.insets.top = UIFactory.TOP_INSET_SECONDARY_FIELD;
gbc.weightx = 0.0;
panel.add(bImport, gbc);
gbc.gridx ++;
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
index 8bce571..42d41e5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/SuffixesToReplicatePanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.installer.ui;
@@ -301,6 +301,7 @@
{
checkBoxPanel.removeAll();
GridBagConstraints gbc = new GridBagConstraints();
+ gbc.gridy = 0;
gbc.fill = GridBagConstraints.BOTH;
gbc.anchor = GridBagConstraints.NORTH;
boolean first = true;
@@ -315,6 +316,7 @@
gbc.gridwidth = GridBagConstraints.RELATIVE;
JCheckBox cb = hmCheckBoxes.get(suffix.getId());
cb.setVerticalAlignment(SwingConstants.TOP);
+ gbc.gridx = 0;
checkBoxPanel.add(cb, gbc);
gbc.insets.left = UIFactory.LEFT_INSET_PRIMARY_FIELD;
gbc.weightx = 1.0;
@@ -331,10 +333,15 @@
gbc.insets.top += Math.abs(cb.getPreferredSize().height -
proto.getPreferredSize().height) / 2;
+ gbc.gridx = 1;
checkBoxPanel.add(l, gbc);
first = false;
+ gbc.gridy ++;
}
- addVerticalGlue(checkBoxPanel);
+ gbc.weighty = 1.0;
+ gbc.insets = UIFactory.getEmptyInsets();
+ gbc.fill = GridBagConstraints.VERTICAL;
+ checkBoxPanel.add(Box.createVerticalGlue(), gbc);
}
private String getSuffixString(SuffixDescriptor desc)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
index ccd4939..ae97416 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/QuickSetup.java
@@ -118,7 +118,15 @@
application.setProgressMessageFormatter(formatter);
application.setCurrentInstallStatus(installStatus);
- initLookAndFeel();
+ try
+ {
+ initLookAndFeel();
+ }
+ catch (Throwable t)
+ {
+ // This is likely a bug.
+ t.printStackTrace();
+ }
/* In the calls to setCurrentStep the dialog will be created */
setCurrentStep(application.getFirstWizardStep());
@@ -643,7 +651,7 @@
* A method to initialize the look and feel.
*
*/
- private void initLookAndFeel()
+ private void initLookAndFeel() throws Throwable
{
UIFactory.initialize();
}
diff --git a/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java b/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
index 5110237..6139948 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/ui/UIFactory.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.quicksetup.ui;
@@ -732,11 +732,13 @@
/**
* This method initialize the look and feel and UI settings.
+ * @throws Throwable if there is a problem initializing the look and feel.
*/
- public static void initialize()
+ public static void initialize() throws Throwable
{
if (!initialized)
{
+ final Throwable[] ts = {null};
Runnable r = new Runnable()
{
public void run()
@@ -744,11 +746,16 @@
System.setProperty("swing.aatext", "true");
try
{
- UIManager.setLookAndFeel(
- UIManager.getSystemLookAndFeelClassName());
+ String lf = UIManager.getSystemLookAndFeelClassName();
+ if (lf.equalsIgnoreCase(
+ "com.sun.java.swing.plaf.motif.MotifLookAndFeel"))
+ {
+ lf = UIManager.getCrossPlatformLookAndFeelClassName();
+ }
+ UIManager.setLookAndFeel(lf);
} catch (Throwable t)
{
- t.printStackTrace();
+ ts[0] = t;
}
JFrame.setDefaultLookAndFeelDecorated(false);
}
@@ -765,9 +772,13 @@
}
catch (Throwable t)
{
- t.printStackTrace();
+ ts[0] = t;
}
}
+ if (ts[0] != null)
+ {
+ throw ts[0];
+ }
initialized = true;
}
}
diff --git a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
index dfcfa8e..764f16b 100644
--- a/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
+++ b/opends/src/server/org/opends/server/backends/jeb/AttributeIndex.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -41,6 +41,7 @@
import org.opends.server.admin.std.server.LocalDBIndexCfg;
import org.opends.server.admin.std.meta.LocalDBIndexCfgDefn;
import org.opends.server.admin.server.ConfigurationChangeListener;
+import org.opends.server.api.EqualityMatchingRule;
import org.opends.server.api.ExtensibleIndexer;
import org.opends.server.api.ExtensibleMatchingRule;
import org.opends.server.api.IndexQueryFactory;
@@ -2373,6 +2374,50 @@
{
//Get the Matching Rule OID of the filter.
String nOID = extensibleFilter.getMatchingRuleID();
+ /**
+ * Use the default equality index in two conditions:
+ * 1. There is no matching rule provided
+ * 2. The matching rule specified is actually the default equality.
+ */
+ EqualityMatchingRule eqRule =
+ indexConfig.getAttribute().getEqualityMatchingRule();
+ if(nOID ==null || nOID.equals(eqRule.getOID()) ||
+ nOID.equalsIgnoreCase(eqRule.getName()))
+ {
+ //No matching rule is defined; use the default equality matching rule.
+ if(equalityIndex == null)
+ {
+ // There is no index on this matching rule.
+ return IndexQuery.createNullIndexQuery().evaluate();
+ }
+ try
+ {
+ // Make a key from the normalized assertion value.
+ byte[] keyBytes =
+ extensibleFilter.getAssertionValue().getNormalizedValue().
+ toByteArray();
+ DatabaseEntry key = new DatabaseEntry(keyBytes);
+
+ if(debugBuffer != null)
+ {
+ debugBuffer.append("[INDEX:");
+ debugBuffer.append(indexConfig.getAttribute().getNameOrOID());
+ debugBuffer.append(".");
+ debugBuffer.append("equality]");
+ }
+
+ // Read the key.
+ return equalityIndex.readKey(key, null, LockMode.DEFAULT);
+ }
+ catch (DirectoryException e)
+ {
+ if (debugEnabled())
+ {
+ TRACER.debugCaught(DebugLogLevel.ERROR, e);
+ }
+ return IndexQuery.createNullIndexQuery().evaluate();
+ }
+ }
ExtensibleMatchingRule rule =
DirectoryServer.getExtensibleMatchingRule(nOID);
IndexQueryFactory<IndexQuery> factory = null;
@@ -2675,4 +2720,4 @@
return substringLength;
}
}
-}
\ No newline at end of file
+}
diff --git a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
index 6e6de1e..a7bc2bf 100644
--- a/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
+++ b/opends/src/server/org/opends/server/backends/jeb/EntryContainer.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.backends.jeb;
import org.opends.messages.Message;
@@ -1899,30 +1899,27 @@
}
/*
- * We will iterate backwards through a range of the dn2id keys to
- * find subordinates of the target entry from the bottom of the tree
- * upwards. For example, any subordinates of "dc=example,dc=com" appear
- * in dn2id with a key ending in ",dc=example,dc=com". The entry
- * "cn=joe,ou=people,dc=example,dc=com" will appear after the entry
- * "ou=people,dc=example,dc=com".
+ * We will iterate forwards through a range of the dn2id keys to
+ * find subordinates of the target entry from the top of the tree
+ * downwards.
*/
- byte[] suffix = StaticUtils.getBytes("," + entryDN.toNormalizedString());
+ byte[] suffix = StaticUtils.getBytes("," +
+ entryDN.toNormalizedString());
/*
- * Set the starting value to a value of equal length but slightly
- * greater than the target DN. Since keys are compared in
- * reverse order we must set the first byte (the comma).
- * No possibility of overflow here.
+ * Set the ending value to a value of equal length but slightly
+ * greater than the suffix.
*/
- byte[] begin = suffix.clone();
- begin[0] = (byte) (begin[0] + 1);
+ byte[] end = suffix.clone();
+ end[0] = (byte) (end[0] + 1);
+
int subordinateEntriesDeleted = 0;
DatabaseEntry data = new DatabaseEntry();
- DatabaseEntry key = new DatabaseEntry(begin);
+ DatabaseEntry key = new DatabaseEntry(suffix);
+
CursorConfig cursorConfig = new CursorConfig();
cursorConfig.setReadCommitted(true);
-
Cursor cursor = dn2id.openCursor(txn, cursorConfig);
try
{
@@ -1930,35 +1927,29 @@
// Initialize the cursor very close to the starting value.
status = cursor.getSearchKeyRange(key, data, LockMode.DEFAULT);
- if (status == OperationStatus.NOTFOUND)
- {
- status = cursor.getLast(key, data, LockMode.DEFAULT);
- }
- // Step back until the key is less than the beginning value
+ // Step forward until the key is greater than the starting value.
while (status == OperationStatus.SUCCESS &&
- dn2id.getComparator().compare(key.getData(), begin) >= 0)
+ dn2id.getComparator().compare(key.getData(), suffix) <= 0)
{
- status = cursor.getPrev(key, data, LockMode.DEFAULT);
+ status = cursor.getNext(key, data, LockMode.DEFAULT);
}
- // Step back until we pass the ending value.
+ // Step forward until we pass the ending value.
while (status == OperationStatus.SUCCESS)
{
- int cmp = dn2id.getComparator().compare(key.getData(), suffix);
- if (cmp < 0)
+ int cmp = dn2id.getComparator().compare(key.getData(), end);
+ if (cmp >= 0)
{
// We have gone past the ending value.
break;
}
// We have found a subordinate entry.
-
if (!isSubtreeDelete)
{
// The subtree delete control was not specified and
// the target entry is not a leaf.
-
Message message =
ERR_JEB_DELETE_NOT_ALLOWED_ON_NONLEAF.get(entryDN.toString());
throw new DirectoryException(ResultCode.NOT_ALLOWED_ON_NONLEAF,
@@ -1986,7 +1977,9 @@
deleteOperation.checkIfCanceled(false);
}
- status = cursor.getPrev(key, data, LockMode.DEFAULT);
+ // Get the next DN.
+ data = new DatabaseEntry();
+ status = cursor.getNext(key, data, LockMode.DEFAULT);
}
}
finally
diff --git a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
index 4bd43ef..e183408 100644
--- a/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
+++ b/opends/src/server/org/opends/server/crypto/CryptoManagerSync.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.server.crypto;
@@ -123,8 +123,26 @@
public CryptoManagerSync()
throws InitializationException
{
+ this(true);
+ }
+
+ /**
+ * Creates a new instance of this trust store synchronization thread.
+ *
+ * @param publishInstanceKey whether the instance key must be published in
+ * the ADS or not.
+ * @throws InitializationException in case an exception occurs during
+ * initialization, such as a failure to publish the instance-key-pair
+ * public-key-certificate in ADS.
+ */
+ public CryptoManagerSync(boolean publishInstanceKey)
+ throws InitializationException
+ {
try {
- CryptoManagerImpl.publishInstanceKeyEntryInADS();
+ if (publishInstanceKey)
+ {
+ CryptoManagerImpl.publishInstanceKeyEntryInADS();
+ }
}
catch (CryptoManagerException ex) {
throw new InitializationException(ex.getMessageObject());
diff --git a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
index cb84ba5..1b1f955 100644
--- a/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
+++ b/opends/src/server/org/opends/server/replication/service/ReplicationBroker.java
@@ -862,13 +862,14 @@
"phase 2 : will perform PhaseOneH with the preferred RS.");
replicationServerInfo = performPhaseOneHandshake(
replicationServerInfo.getServerURL(), true);
- // Update replication server info with potentially more up to date data
- // (server state for instance may have changed)
- replicationServerInfos.put(replicationServerInfo.getServerId(),
- replicationServerInfo);
if (replicationServerInfo != null)
{
+ // Update replication server info with potentially more up to date
+ // data (server state for instance may have changed)
+ replicationServerInfos.put(replicationServerInfo.getServerId(),
+ replicationServerInfo);
+
// Handshake phase 1 exchange went well
// Compute in which status we are starting the session to tell the RS
@@ -2383,10 +2384,14 @@
{
synchronized (connectPhaseLock)
{
+ // session may have been set to null in the connection phase
+ // when restarting the broker for example.
+
// check the session. If it has changed, some
// deconnection/reconnection happened and we need to restart from
// scratch.
- if (session == current_session)
+ if ((session != null) &&
+ (session == current_session))
{
session.publish(msg);
done = true;
diff --git a/opends/src/server/org/opends/server/tools/EncodePassword.java b/opends/src/server/org/opends/server/tools/EncodePassword.java
index 07a0d47..ff89902 100644
--- a/opends/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opends/src/server/org/opends/server/tools/EncodePassword.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -535,7 +535,7 @@
int size = storageSchemes.size();
ArrayList<String> nameList = new ArrayList<String>(size);
- for (PasswordStorageScheme s : storageSchemes.values())
+ for (PasswordStorageScheme<?> s : storageSchemes.values())
{
nameList.add(s.getAuthPasswordSchemeName());
}
@@ -566,7 +566,7 @@
int size = storageSchemes.size();
ArrayList<String> nameList = new ArrayList<String>(size);
- for (PasswordStorageScheme s : storageSchemes.values())
+ for (PasswordStorageScheme<?> s : storageSchemes.values())
{
nameList.add(s.getStorageSchemeName());
}
@@ -622,7 +622,7 @@
return 1;
}
- PasswordStorageScheme storageScheme =
+ PasswordStorageScheme<?> storageScheme =
DirectoryServer.getAuthPasswordStorageScheme(scheme);
if (storageScheme == null)
{
@@ -672,7 +672,7 @@
}
else
{
- PasswordStorageScheme storageScheme;
+ PasswordStorageScheme<?> storageScheme;
String encodedPWString;
if (UserPasswordSyntax.isEncoded(encodedPW))
@@ -772,7 +772,7 @@
else
{
// Try to get a reference to the requested password storage scheme.
- PasswordStorageScheme storageScheme;
+ PasswordStorageScheme<?> storageScheme;
if (authPasswordSyntax.isPresent())
{
String scheme = schemeName.getValue();
@@ -912,7 +912,7 @@
//Initialize PWD policy components.
directoryServer.initializePasswordPolicyComponents();
//Load the crypto-manager key cache among other things.
- new CryptoManagerSync();
+ new CryptoManagerSync(false);
} catch (InitializationException ie) {
Message message = ERR_ENCPW_CANNOT_INITIALIZE_SERVER_COMPONENTS.get(
getExceptionMessage(ie));
@@ -955,7 +955,7 @@
backendCfg instanceof LDIFBackendCfg) {
if(backendCfg.isEnabled()) {
String className = backendCfg.getJavaClass();
- Class backendClass;
+ Class<?> backendClass;
Backend backend;
try {
backendClass = DirectoryServer.loadClass(className);
@@ -1181,7 +1181,7 @@
try
{
// attempt masking at this rate
- this.sleep(1);
+ ErasingThread.sleep(1);
}
catch (InterruptedException iex)
{
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index e7ae5bd..0a96b1b 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2006-2009 Sun Microsystems, Inc.
+ * Copyright 2006-2010 Sun Microsystems, Inc.
*/
package org.opends.server.tools;
@@ -324,9 +324,7 @@
try {
QuickSetupLog.initLogFileHandler(
QuickSetupLog.isInitialized() ? null :
- File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX),
- "org.opends.server.tools");
- QuickSetupLog.disableConsoleLogging();
+ File.createTempFile(LOG_FILE_PREFIX, LOG_FILE_SUFFIX));
} catch (Throwable t) {
System.err.println("Unable to initialize log");
t.printStackTrace();
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-11.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-11.ldif
new file mode 100644
index 0000000..c81e69f
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-11.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective departmentNumber,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective departmentNumber
+departmentNumber;collective: 445566
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 2, maximum 2}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-12.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-12.ldif
new file mode 100644
index 0000000..3f69eae
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-12.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective c-PostOfficeBox,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-PostOfficeBox
+c-PostOfficeBox: PO BOX 2869
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 2, maximum 2}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14a.ldif
new file mode 100644
index 0000000..412a14d
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14a.ldif
@@ -0,0 +1,4 @@
+dn: cn=schema
+changetype: modify
+add: attributeTypes
+attributeTypes: ( test-oid NAME 'commonSecretary' EQUALITY caseIgnoreMatch ORDERING caseIgnoreOrderingMatch SUBSTR caseIgnoreSubstringsMatch SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 USAGE userApplications X-SCHEMA-FILE '99-user.ldif' )
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14b.ldif
new file mode 100644
index 0000000..d70c6f2
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-14b.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective commonSecretary,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective commonSecretary
+commonSecretary;collective: uid=gfarmer,ou=America,ou=People,o=collectiveattr tests,dc=example
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 2}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-15.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-15.ldif
new file mode 100644
index 0000000..9cac554
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-15.ldif
@@ -0,0 +1,17 @@
+dn: cn=Collective PostalAddress,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective PostalAddress
+PostalAddress;collective: Example Com$ 40388 Sixth Street$Detroit, WA 87003
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+
+dn: cn=Collective c-PostalAddress,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-PostalAddress
+c-PostalAddress: Example Com$30754 College Street$El Paso, VT 70898
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16a.ldif
new file mode 100644
index 0000000..67b8453
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16a.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective facsimileTelephoneNumber,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective facsimileTelephoneNumber
+facsimileTelephoneNumber;collective: +1 408 555 8477
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16b.ldif
new file mode 100644
index 0000000..70b0960
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-16b.ldif
@@ -0,0 +1,15 @@
+dn: uid=rdaugherty,ou=Asia,ou=People,o=collectiveattr tests,dc=example,dc=com
+cn: Robert Daugherty
+sn: Daugherty
+givenname: Robert
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+l: Sunnyvale
+uid: rdaugherty
+mail: rdaugherty@example.com
+telephonenumber: +1 408 555 1296
+facsimiletelephonenumber: +1 408 555 1992
+roomnumber: 0194
+userpassword: apples
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-17.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-17.ldif
new file mode 100644
index 0000000..e8e92a7
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-17.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective c-PhysicalDeliveryOfficeName,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-PhysicalDeliveryOfficeName
+c-PhysicalDeliveryOfficeName: par07
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18a.ldif
new file mode 100644
index 0000000..258c763
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18a.ldif
@@ -0,0 +1,9 @@
+dn: cn=Collective employeeType,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective employeeType
+employeeType;collective: LTR-3
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+collectiveConflictBehavior: virtual-overrides-real
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18b.ldif
new file mode 100644
index 0000000..36ecb7a
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-18b.ldif
@@ -0,0 +1,16 @@
+dn: uid=jreuter,ou=Europe,ou=People,o=collectiveattr tests,dc=example,dc=com
+cn: Jayne Reuter
+sn: Reuter
+givenname: Jayne
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+l: Sunnyvale
+uid: jreuter
+mail: jreuter@example.com
+telephonenumber: +1 408 555 1122
+facsimiletelephonenumber: +1 408 555 8721
+roomnumber: 2942
+userpassword: destroy
+employeeType: BTX-2
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-19.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-19.ldif
new file mode 100644
index 0000000..5df7608
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-19.ldif
@@ -0,0 +1,9 @@
+dn: cn=Collective c-PostalCode,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-PostalCode
+c-PostalCode: 76800
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+collectiveConflictBehavior: virtual-overrides-real
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20a.ldif
new file mode 100644
index 0000000..c55620e
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20a.ldif
@@ -0,0 +1,9 @@
+dn: cn=Collective preferredLanguage,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective preferreLanguage
+preferredLanguage;collective: zh_CN
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+collectiveConflictBehavior: merge-real-and-virtual
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20b.ldif
new file mode 100644
index 0000000..dd7bc57
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-20b.ldif
@@ -0,0 +1,16 @@
+dn: uid=tmason,ou=America,ou=People,o=collectiveattr tests,dc=example,dc=com
+cn: Torrey Mason
+sn: Mason
+givenname: Torrey
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+l: Sunnyvale
+uid: tmason
+mail: tmason@example.com
+telephonenumber: +1 408 555 1596
+facsimiletelephonenumber: +1 408 555 9751
+roomnumber: 1124
+userpassword: squatted
+preferredLanguage: ja_JP
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21a.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21a.ldif
new file mode 100644
index 0000000..d09f30b
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21a.ldif
@@ -0,0 +1,9 @@
+dn: cn=Collective c-l,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-l
+c-l: Santa Clara
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+collectiveConflictBehavior: merge-real-and-virtual
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21b.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21b.ldif
new file mode 100644
index 0000000..fb2134a
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-21b.ldif
@@ -0,0 +1,15 @@
+dn: uid=bhall,ou=North,ou=America,ou=People,o=collectiveattr tests,dc=example,dc=com
+cn: Benjamin Hall
+sn: Hall
+givenname: Benjamin
+objectclass: top
+objectclass: person
+objectclass: organizationalPerson
+objectclass: inetOrgPerson
+l: Sunnyvale
+uid: bhall
+mail: bhall@example.com
+telephonenumber: +1 408 555 6067
+facsimiletelephonenumber: +1 408 555 0111
+roomnumber: 2511
+userpassword: oranges
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-4.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-4.ldif
new file mode 100644
index 0000000..a5bdb78
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-4.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective c-PostalAddress,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-PostalAddress
+c-PostalAddress: Example Com$01251 Chestnut Street$Panama City, DE 50369
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-5.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-5.ldif
new file mode 100644
index 0000000..2079435
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-5.ldif
@@ -0,0 +1,4 @@
+dn: cn=Collective c-PostalAddress,dc=example,dc=com
+changetype: modify
+replace: c-PostalAddress
+c-PostalAddress: Collective Attr$76600 Williams Street$Bowling Green, NH 91588
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-7.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-7.ldif
new file mode 100644
index 0000000..934ab01
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-7.ldif
@@ -0,0 +1,17 @@
+dn: cn=Collective Secretary,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective Secretary
+secretary;collective: uid=tmorris,ou=Asia,ou=People,o=collectiveattr tests,dc=example,dc=com
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
+
+dn: cn=Collective c-TelexNumber,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-TelexNumber
+c-TelexNumber: 959$105$TYR
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 1}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-8.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-8.ldif
new file mode 100644
index 0000000..f5da1d4
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-8.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective businessCategory,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective businessCategory
+businesscategory;collective: Finance Group
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 3}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-9.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-9.ldif
new file mode 100644
index 0000000..7c73377
--- /dev/null
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/collectiveattr-9.ldif
@@ -0,0 +1,8 @@
+dn: cn=Collective c-ou,dc=example,dc=com
+objectClass: top
+objectClass: subentry
+objectClass: collectiveAttributeSubentry
+objectClass: extensibleObject
+cn: Collective c-ou
+c-ou: corporate
+subtreeSpecification: {base "ou=people,o=collectiveattr tests", minimum 3}
diff --git a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_collectiveattr.ldif b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_collectiveattr.ldif
index 4eb739a..3625acb 100755
--- a/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_collectiveattr.ldif
+++ b/opends/tests/staf-tests/functional-tests/shared/data/core/ldifs/core_collectiveattr.ldif
@@ -88,7 +88,6 @@
l: Sunnyvale
ou: Europe
ou: People
-facsimileTelephoneNumber: +1 408 555 3372
dn: uid=abergin,ou=Europe,ou=People,o=collectiveattr tests,dc=example,dc=com
objectClass: person
@@ -106,7 +105,6 @@
l: Cupertino
ou: Europe
ou: People
-facsimileTelephoneNumber: +1 408 555 7472
dn: uid=dmiller,ou=America,ou=People,o=collectiveattr tests,dc=example,dc=com
objectClass: person
@@ -125,6 +123,8 @@
ou: America
ou: People
facsimileTelephoneNumber: +1 408 555 0111
+employeeType: MGT-1
+preferredLanguage: fr
dn: uid=gfarmer,ou=America,ou=People,o=collectiveattr tests,dc=example,dc=com
objectClass: person
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml
index b6afade..2080d8f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_add_entry.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -88,11 +88,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/aci/aci_add_entry/aci_startup_add_entry_tests.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -142,10 +137,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals all, user adding entry to targeted branch'
</message>
@@ -158,10 +149,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals all, Directory Manager searching added entry'
</message>
@@ -175,10 +162,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals all, user adding entry to non-targeted branch'
</message>
@@ -205,10 +188,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals all, user adding entry in previously targeted branch'
</message>
@@ -271,10 +250,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, user adding entry in targeted branch'
</message>
@@ -287,10 +262,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, Directory Manager searching added entry'
</message>
@@ -304,10 +275,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, user adding entry in targeted branch with a prohibited userdn'
</message>
@@ -348,10 +315,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn equals a dn, user adding entry in previously targeted branch'
</message>
@@ -415,10 +378,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, user adding entry in targeted branch'
</message>
@@ -431,10 +390,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_allow-add_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, Directory Manager searching added entry'
</message>
@@ -448,10 +403,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, user adding entry in targeted branch with a prohibited userdn'
</message>
@@ -492,10 +443,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, user adding entry in previously targeted branch'
</message>
@@ -554,10 +501,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - add not allowed, user adding entry in targeted branch'
</message>
@@ -584,10 +527,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - userdn not equals a dn, user adding entry in previously targeted branch'
</message>
@@ -650,10 +589,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter equals one statement, user adding entry in targeted branch'
</message>
@@ -666,10 +601,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetfilter_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter equals one statement, Directory Manager searching added entry'
</message>
@@ -683,10 +614,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter equals one statement, user adding entry in non-targeted branch'
</message>
@@ -713,10 +640,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter equals one statement, user adding entry in previously targeted branch'
</message>
@@ -776,10 +699,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter with non-existent attribute, user adding entry in targeted branch'
</message>
@@ -820,10 +739,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetfilter with non-existent attribute, user adding entry in previously targeted branch'
</message>
@@ -887,10 +802,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetattr with one attribute, user adding entry in targeted branch'
</message>
@@ -903,10 +814,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_targetattr_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetattr with one attribute, Directory Manager searching added entry'
</message>
@@ -920,10 +827,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetattr with one attribute, user adding entry in non-targeted branch'
</message>
@@ -950,10 +853,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targetattr with one attribute, user adding entry in previously targeted branch'
</message>
@@ -1016,10 +915,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add:,del:, user adding entry in targeted branch'
</message>
@@ -1032,10 +927,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add:,del:, Directory Manager searching added entry'
</message>
@@ -1049,10 +940,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add:,del:, user adding entry in non-targeted branch'
</message>
@@ -1079,10 +966,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add:,del:, user adding entry in previously targeted branch'
</message>
@@ -1144,10 +1027,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: only, user adding entry in targeted branch'
</message>
@@ -1160,10 +1039,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_targattrfilter_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: only, Directory Manager searching added entry'
</message>
@@ -1177,10 +1052,6 @@
'dsFilter' : 'objectclass=*' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: only, user adding entry in non-targeted branch'
</message>
@@ -1207,10 +1078,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: only, user adding entry in previously targeted branch'
</message>
@@ -1270,10 +1137,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: statement false, user adding entry in targeted branch'
</message>
@@ -1314,10 +1177,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - targattrfilter with add: statement false, user adding entry in previously targeted branch'
</message>
@@ -1378,10 +1237,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 1, user adding entry in targeted branch'
</message>
@@ -1422,10 +1277,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 1, user adding entry in previously targeted branch'
</message>
@@ -1486,10 +1337,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 2, user adding entry in targeted branch'
</message>
@@ -1502,10 +1349,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 2, user adding entry in non-targeted branch'
</message>
@@ -1532,10 +1375,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 2, user adding entry in previously targeted branch'
</message>
@@ -1597,10 +1436,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 3, user adding entry in targeted branch'
</message>
@@ -1613,10 +1448,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 3, user adding entry in targeted branch by a prohibited user'
</message>
@@ -1657,10 +1488,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 3, user adding entry in previously targeted branch'
</message>
@@ -1721,10 +1548,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 4, user adding entry in targeted branch'
</message>
@@ -1737,10 +1560,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 4, user adding entry in non-targeted branch'
</message>
@@ -1767,10 +1586,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 4, user adding entry in previously targeted branch'
</message>
@@ -1832,10 +1647,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 5, user adding entry in targeted branch'
</message>
@@ -1848,10 +1659,6 @@
'entryToBeAdded' : '%s/aci/aci_add_entry/add_multi_aci_entry5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 5, user adding entry in targeted branch by a prohibited user'
</message>
@@ -1892,10 +1699,6 @@
'entryToBeModified' : '%s/aci/aci_add_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Add: Add Entry - Multi ACIs 5, user adding entry in previously targeted branch'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
index 40af67b..c591ef3 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_bindtypes.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -108,10 +108,6 @@
'entryToBeAdded' : '%s/aci/aci_bindtypes/aci_startup_bindtypes.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: Preamble - user searching entry that will be targeted in future tests'
</message>
@@ -148,10 +144,6 @@
'entryToBeAdded' : '%s/aci/aci_bindtypes/add_static_groups.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: Preamble - Adding Dynamic Groups For Bind Type Tests'
</message>
@@ -164,10 +156,6 @@
'entryToBeAdded' : '%s/aci/aci_bindtypes/add_dynamic_groups.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: Preamble - admin searching one entry for isMemberOf of static group'
</message>
@@ -273,10 +261,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static group, user searching targeted entry with group member'
</message>
@@ -391,10 +375,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static group, user searching previously targeted entry'
</message>
@@ -463,10 +443,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals two static groups, user searching targeted entry with group member'
</message>
@@ -587,10 +563,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals two static groups, user searching previously targeted entry'
</message>
@@ -659,10 +631,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals one static group, user searching targeted entry with different group member'
</message>
@@ -783,10 +751,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals one static group, user searching previously targeted entry'
</message>
@@ -855,10 +819,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals two static groups, user searching targeted entry with group member'
</message>
@@ -973,10 +933,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals two static groups, user searching previously targeted entry'
</message>
@@ -1045,10 +1001,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one dynamic group, user searching targeted entry with group member'
</message>
@@ -1163,10 +1115,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one dynamic group, user searching previously targeted entry'
</message>
@@ -1235,10 +1183,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals two dynamic groups, user searching targeted entry with group member'
</message>
@@ -1359,10 +1303,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals two dynamic groups, user searching previously targeted entry'
</message>
@@ -1431,10 +1371,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals one dynamic group, user searching targeted entry with different group member'
</message>
@@ -1555,10 +1491,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals one dynamic group, user searching previously targeted entry'
</message>
@@ -1627,10 +1559,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals two dynamic groups, user searching targeted entry with group member'
</message>
@@ -1745,10 +1673,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn not equals two dynamic groups, user searching previously targeted entry'
</message>
@@ -1817,10 +1741,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static group with wildcard, user searching targeted entry'
</message>
@@ -1929,10 +1849,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static group with wildcard, user searching previously targeted entry'
</message>
@@ -2001,10 +1917,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static and one dynamic group, user searching targeted entry with group member'
</message>
@@ -2125,10 +2037,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static and one dynamic group, user searching previously targeted entry'
</message>
@@ -2198,10 +2106,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
@@ -2219,10 +2123,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add member, adding new static member'
</message>
@@ -2235,10 +2135,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/add_new_member_static1.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add member, user searching targeted entry with new group member'
</message>
@@ -2305,10 +2201,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn equals one static group, admin deleting aci'
</message>
@@ -2321,10 +2213,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add member, user searching previously targeted entry'
</message>
@@ -2393,10 +2281,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
@@ -2414,10 +2298,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite delete member, deleting old static member'
</message>
@@ -2430,10 +2310,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_old_member_static2.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite delete member, admin deleting selfwrite aci'
</message>
@@ -2446,10 +2322,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite delete member, user searching targeted entry with old group member'
</message>
@@ -2492,10 +2364,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite delete member, user searching previously targeted entry'
</message>
@@ -2564,10 +2432,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_static_selfwrite.ldif'
curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
@@ -2585,10 +2449,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite delete member, replacing old static member'
</message>
@@ -2615,10 +2475,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite replace member, user searching targeted entry with old group member'
</message>
@@ -2661,10 +2517,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite replace member, user searching previously targeted entry'
</message>
@@ -2733,10 +2585,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_static_selfwrite2.ldif'
curr_aci=retrieve_aci('%s/aci/aci_bindtypes/%s' % (local.data,curr_aci_ldif_file));
@@ -2754,10 +2602,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add description, add new description'
</message>
@@ -2784,10 +2628,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_static_selfwrite2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add description, user searching targeted entry with old group member'
</message>
@@ -2830,10 +2670,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: groupdn - selfwrite add description, user searching previously targeted entry'
</message>
@@ -2905,10 +2741,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr, user searching targeted entry with all attributes'
</message>
@@ -3070,10 +2902,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr, user searching previously targeted entry'
</message>
@@ -3145,10 +2973,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr not equals one attr, user searching entry with all attributes with no matching attribute value'
</message>
@@ -3333,10 +3157,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr not equals one attr, user searching previously targeted entry'
</message>
@@ -3404,10 +3224,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with bindtype, user searching targeted entry with all attributes'
</message>
@@ -3504,10 +3320,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with bindtype, user searching previously targeted entry'
</message>
@@ -3576,10 +3388,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with groupdn, user searching targeted entry with group member'
</message>
@@ -3700,10 +3508,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with groupdn, user searching previously targeted entry'
</message>
@@ -3772,14 +3576,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with groupdn, url expression, user searching targeted entry with group member'
</message>
@@ -3855,10 +3651,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one attr with groupdn, url expression, user searching previously targeted entry'
</message>
@@ -3926,10 +3718,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, user searching targeted entry'
</message>
@@ -4047,10 +3835,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, deny children, user searching previously targeted entry'
</message>
@@ -4120,10 +3904,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow one child level, user searching targeted entry'
</message>
@@ -4241,10 +4021,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow one child level, user searching previously targeted entry'
</message>
@@ -4313,10 +4089,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow two child levels, user searching targeted entry'
</message>
@@ -4434,10 +4206,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: inheritance with bindtype, allow two child levels, user searching previously targeted entry'
</message>
@@ -4507,10 +4275,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one operational attr with bindtype, user searching targeted entry with all attributes'
</message>
@@ -4586,10 +4350,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userattr equals one operational attr with bindtype, user searching previously targeted entry'
</message>
@@ -4899,10 +4659,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userdn with filter, user searching targeted entry with group member'
</message>
@@ -4975,10 +4731,6 @@
'entryToBeModified' : '%s/aci/aci_bindtypes/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: userdn with filter, user searching previously targeted entry'
</message>
@@ -5070,10 +4822,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: authmethod equals none, anonymous search'
</message>
@@ -5111,10 +4859,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: authmethod equals none, anonymous search'
</message>
@@ -5174,10 +4918,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Bind Types: Resetting Search Global ACI'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
index b7a843a..101d20b 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_compare_tests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -136,10 +136,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals all, user comparing attribute in targeted branch'
</message>
@@ -190,10 +186,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals all, user comparing attribute in previously targeted branch'
</message>
@@ -257,10 +249,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a dn, user comparing attribute in targeted branch'
</message>
@@ -326,10 +314,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a dn, user comparing attribute in previously targeted branch'
</message>
@@ -391,10 +375,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals a branch dn, user comparing attribute in targeted branch'
</message>
@@ -452,10 +432,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals a branch dn, user comparing attribute in previously targeted branch'
</message>
@@ -519,10 +495,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a branch dn, user comparing attribute in targeted branch'
</message>
@@ -596,10 +568,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals a branch dn, user comparing attribute in previously targeted branch'
</message>
@@ -663,10 +631,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals two dns, user comparing attribute in targeted branch'
</message>
@@ -740,10 +704,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn equals two dns, user comparing attribute in previously targeted branch'
</message>
@@ -805,10 +765,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals two dns, user comparing attribute in targeted branch'
</message>
@@ -866,10 +822,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn not equals two dns, user comparing attribute in previously targeted branch'
</message>
@@ -929,10 +881,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn compare not allowed, user comparing attribute in targeted branch'
</message>
@@ -975,10 +923,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - userdn compare not allowed, user comparing attribute in previously targeted branch'
</message>
@@ -1042,10 +986,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattr with one attribute, user comparing attribute in targeted branch'
</message>
@@ -1111,10 +1051,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattr with one attribute, user comparing attribute in previously targeted branch'
</message>
@@ -1178,10 +1114,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetfilter with one statement, user comparing attribute in targeted branch'
</message>
@@ -1247,10 +1179,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetfilter with one statement, user comparing attribute in previously targeted branch'
</message>
@@ -1314,10 +1242,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, user comparing attribute in targeted branch'
</message>
@@ -1391,10 +1315,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, user comparing attribute in previously targeted branch'
</message>
@@ -1458,10 +1378,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false, user comparing attribute in targeted branch'
</message>
@@ -1535,10 +1451,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - targetattrfilter with add:,del:, returns false, user comparing attribute in previously targeted branch'
</message>
@@ -1598,10 +1510,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 1, overall deny, user comparing attribute in targeted branch'
</message>
@@ -1629,10 +1537,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 1, overall deny, user comparing attribute in previously targeted branch'
</message>
@@ -1694,10 +1598,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 2, overall allow, user comparing attribute in targeted branch'
</message>
@@ -1733,10 +1633,6 @@
'entryToBeModified' : '%s/aci/aci_compare_tests/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Compare: Compare Attr - Multi ACIs 2, overall allow, user comparing attribute in previously targeted branch'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml
index f6b37a7..48e8aca 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_delete_entry.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -91,10 +91,6 @@
'entryToBeAdded' : '%s/aci/aci_delete_entry/aci_startup_delete_entry_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Preamble - Directory Manager searching entry that will be in targeted branch'
</message>
@@ -109,10 +105,6 @@
'attributes' : 'cn sn uid'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Preamble - Directory Manager searching entry that will be in non-targeted branch'
</message>
@@ -126,11 +118,6 @@
'dsFilter' : 'objectclass=*' ,
'attributes' : 'cn sn uid'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -181,10 +168,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals all, user deleting entry from targeted branch'
</message>
@@ -197,10 +180,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals all, Directory Manager searching deleted entry'
</message>
@@ -242,10 +221,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals all, user deleting entry in previously targeted branch'
</message>
@@ -309,10 +284,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, user deleting entry from targeted branch'
</message>
@@ -325,10 +296,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, Directory Manager searching deleted entry'
</message>
@@ -384,10 +351,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn equals a dn, user deleting entry in previously targeted branch'
</message>
@@ -451,10 +414,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, user deleting entry from targeted branch'
</message>
@@ -467,10 +426,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_allow-delete_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, Directory Manager searching deleted entry'
</message>
@@ -526,10 +481,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - userdn not equals a dn, user deleting entry in previously targeted branch'
</message>
@@ -589,10 +540,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - delete not allowed, user deleting entry from targeted branch'
</message>
@@ -619,10 +566,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - delete not allowed, user deleting entry in previously targeted branch'
</message>
@@ -685,10 +628,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals one statement, user deleting entry from targeted branch'
</message>
@@ -701,10 +640,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals one statement, Directory Manager searching deleted entry'
</message>
@@ -746,10 +681,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals one statement, user deleting entry in previously targeted branch'
</message>
@@ -809,10 +740,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (or) all false, user deleting entry from targeted branch'
</message>
@@ -853,10 +780,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (or) all false, user deleting entry in previously targeted branch'
</message>
@@ -917,10 +840,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter not equals three statements (or) all false, user deleting entry from targeted branch'
</message>
@@ -933,10 +852,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter not equals three statements (or) all false, user deleting entry from non-targeted branch'
</message>
@@ -963,10 +878,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter not equals three statements (or) all false, user deleting entry in previously targeted branch'
</message>
@@ -1027,10 +938,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (and) all true, user deleting entry from targeted branch'
</message>
@@ -1043,10 +950,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetfilter_entry4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (and) all true, user deleting entry from non-targeted branch'
</message>
@@ -1073,10 +976,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three statements (and) all true, user deleting entry in previously targeted branch'
</message>
@@ -1137,10 +1036,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter contains attribute not present, user deleting entry from targeted branch'
</message>
@@ -1181,10 +1076,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter contains attribute not present, user deleting entry in previously targeted branch'
</message>
@@ -1247,10 +1138,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three attributes, user deleting entry from targeted branch'
</message>
@@ -1263,10 +1150,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three attributes, user deleting entry from non-targeted branch'
</message>
@@ -1293,10 +1176,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals three attributes, user deleting entry in previously targeted branch'
</message>
@@ -1357,10 +1236,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetattr equals attribute not present, user deleting entry from targeted branch'
</message>
@@ -1373,10 +1248,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targetattr_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetattr equals attribute not present, user deleting entry from non-targeted branch'
</message>
@@ -1403,10 +1274,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetattr equals attribute not present, user deleting entry in previously targeted branch'
</message>
@@ -1468,10 +1335,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals attr value, user deleting entry from targeted branch'
</message>
@@ -1484,10 +1347,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_targattrfilter_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals attr value, user deleting entry from non-targeted branch'
</message>
@@ -1514,10 +1373,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - targetfilter equals attr value, user deleting entry in previously targeted branch'
</message>
@@ -1593,10 +1448,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - delete branch, user deleting branch from targeted branch'
</message>
@@ -1610,10 +1461,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - delete branch, Directory Manager searching deleted branch'
</message>
@@ -1666,12 +1513,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeModified' : '%s/aci/aci_delete_entry/del_aci.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
@@ -1718,10 +1560,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 1, user deleting entry from targeted branch'
</message>
@@ -1762,10 +1600,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 1, user deleting entry in previously targeted branch'
</message>
@@ -1826,10 +1660,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 2, user deleting entry from targeted branch'
</message>
@@ -1842,10 +1672,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 2, user deleting entry from non-targeted branch'
</message>
@@ -1872,10 +1698,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 2, user deleting entry in previously targeted branch'
</message>
@@ -1937,10 +1759,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 3, user deleting entry from targeted branch by a prohibited userdn'
</message>
@@ -1967,10 +1785,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 3, user deleting entry from non-targeted branch'
</message>
@@ -1997,10 +1811,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 3, user deleting entry in previously targeted branch'
</message>
@@ -2061,10 +1871,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry from targeted branch'
</message>
@@ -2077,10 +1883,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry from non-targeted branch'
</message>
@@ -2107,10 +1909,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 4, user deleting entry in previously targeted branch'
</message>
@@ -2172,10 +1970,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from targeted branch by a prohibited userdn'
</message>
@@ -2202,10 +1996,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_aci_entry5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry from non-targeted branch'
</message>
@@ -2232,10 +2022,6 @@
'entryToBeModified' : '%s/aci/aci_delete_entry/del_multi_acis2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Delete Entry - multi ACIs 5, user deleting entry in previously targeted branch'
</message>
@@ -2289,10 +2075,6 @@
'attributes' : 'cn sn uid'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Delete: Postamble - Directory Manager searching entry that was in non-targeted branch'
</message>
@@ -2306,11 +2088,6 @@
'dsFilter' : 'objectclass=*' ,
'attributes' : 'cn sn uid'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
index d710e91..7998aea 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_effective_rights.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -119,11 +119,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -233,10 +228,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - read, user searching targeted entry'
</message>
@@ -311,10 +302,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - read, user searching previously targeted entry'
</message>
@@ -385,10 +372,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search, user searching targeted entry'
</message>
@@ -463,10 +446,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search, user searching previously targeted entry'
</message>
@@ -539,10 +518,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search-read, user searching targeted entry'
</message>
@@ -673,10 +648,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search-read, user searching previously targeted entry'
</message>
@@ -746,10 +717,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search-read, separate ACIs, user searching targeted entry'
</message>
@@ -824,10 +791,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - search-read, separate ACIs, user searching previously targeted entry'
</message>
@@ -897,10 +860,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - compare, user searching targeted entry'
</message>
@@ -975,10 +934,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - compare, user searching previously targeted entry'
</message>
@@ -1048,10 +1003,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - add, user searching targeted entry'
</message>
@@ -1132,10 +1083,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - add, user searching previously targeted entry'
</message>
@@ -1205,10 +1152,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - delete, user searching targeted entry'
</message>
@@ -1289,10 +1232,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - delete, user searching previously targeted entry'
</message>
@@ -1362,10 +1301,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - write, user searching targeted entry'
</message>
@@ -1446,10 +1381,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - write, user searching previously targeted entry'
</message>
@@ -1519,10 +1450,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - proxy, user searching targeted entry'
</message>
@@ -1603,10 +1530,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - proxy, user searching previously targeted entry'
</message>
@@ -1676,10 +1599,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - selfwrite, user searching targeted entry'
</message>
@@ -1760,10 +1679,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - selfwrite, user searching previously targeted entry'
</message>
@@ -1835,10 +1750,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - all, user searching targeted entry'
</message>
@@ -1919,10 +1830,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - all, user searching previously targeted entry'
</message>
@@ -1992,10 +1899,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - export, user searching targeted entry'
</message>
@@ -2070,10 +1973,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - export, user searching previously targeted entry'
</message>
@@ -2143,10 +2042,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - import, user searching targeted entry'
</message>
@@ -2221,10 +2116,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: Basic - import, user searching previously targeted entry'
</message>
@@ -2295,10 +2186,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: targetattr with search,read, user searching targeted entry'
</message>
@@ -2373,10 +2260,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: targetattr with search,read, user searching previously targeted entry'
</message>
@@ -2447,10 +2330,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: targetattr with not equal and search,read, user searching targeted entry'
</message>
@@ -2525,10 +2404,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Effective Rights: targetattr with not equal and search,read, user searching previously targeted entry'
</message>
@@ -2588,10 +2463,6 @@
'entryToBeModified' : '%s/aci/aci_effective_rights/del_effrights_aci.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'
</script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml
index 0f07d03..0351c24 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_entry.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -88,11 +88,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/aci/aci_modify_entry/aci_startup_modify_tests.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -142,10 +137,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - userdn equals all, user modifying entry from targeted branch'
</message>
@@ -158,10 +149,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - userdn equals all, user modifying entry from non-targeted branch'
</message>
@@ -188,10 +175,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - userdn equals all, user modifying entry in previously targeted branch'
</message>
@@ -254,10 +237,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr equals three attributes, user modifying entry from targeted branch'
</message>
@@ -270,10 +249,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr equals three attributes, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -314,10 +289,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr equals three attributes, user modifying entry in previously targeted branch'
</message>
@@ -380,10 +351,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes, user modifying entry from targeted branch'
</message>
@@ -396,10 +363,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -440,10 +403,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr not equals three attributes, user modifying entry in previously targeted branch'
</message>
@@ -504,10 +463,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - write not allowed, user modifying entry from targeted branch'
</message>
@@ -562,10 +517,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - write not allowed, user modifying entry in previously targeted branch'
</message>
@@ -630,10 +581,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying entry from targeted branch'
</message>
@@ -646,10 +593,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_entry5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targattrfilter) in entry from targeted branch'
</message>
@@ -718,10 +661,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetattr and targattrfilter, user modifying entry in previously targeted branch'
</message>
@@ -783,10 +722,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true, user modifying entry from targeted branch'
</message>
@@ -799,10 +734,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -843,10 +774,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter with three statements with or, one statement true, user modifying entry in previously targeted branch'
</message>
@@ -908,10 +835,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true , user modifying entry from targeted branch'
</message>
@@ -924,10 +847,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_entry7.1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true , user modifying prohibited attr in entry from targeted branch'
</message>
@@ -968,10 +887,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - targetfilter not equals three statements with and, all statements true , user modifying entry in previously targeted branch'
</message>
@@ -1032,10 +947,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 1, user modifying entry from targeted branch'
</message>
@@ -1076,10 +987,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 1, user modifying entry in previously targeted branch'
</message>
@@ -1140,10 +1047,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 2, user modifying entry from targeted branch'
</message>
@@ -1156,10 +1059,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 2, user modifying entry from non-targeted branch'
</message>
@@ -1186,10 +1085,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 2, user modifying entry in previously targeted branch'
</message>
@@ -1251,10 +1146,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 3, user modifying entry by prohibited user from targeted branch'
</message>
@@ -1281,10 +1172,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry10.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 3, user modifying entry from non-targeted branch'
</message>
@@ -1311,10 +1198,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 3, user modifying entry in previously targeted branch'
</message>
@@ -1375,10 +1258,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 4, user modifying entry from targeted branch'
</message>
@@ -1391,10 +1270,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry11.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 4, user modifying entry from non-targeted branch'
</message>
@@ -1421,10 +1296,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 4, user modifying entry in previously targeted branch'
</message>
@@ -1486,10 +1357,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 5, user modifying entry by prohibited user from targeted branch'
</message>
@@ -1516,10 +1383,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_multi_acis_entry12.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 5, user modifying entry from non-targeted branch'
</message>
@@ -1546,10 +1409,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_multi_acis2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Modify Attribute Value - multiple ACIs 5, user modifying entry in previously targeted branch'
</message>
@@ -1612,10 +1471,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - userdn equals dn, user modifying entry from targeted branch'
</message>
@@ -1642,10 +1497,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - userdn equals dn, user modifying entry from non-targeted branch'
</message>
@@ -1672,10 +1523,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - userdn equals dn, user modifying entry in previously targeted branch'
</message>
@@ -1738,10 +1585,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr equals one attribute, user modifying entry from targeted branch'
</message>
@@ -1754,10 +1597,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr equals one attribute, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -1798,10 +1637,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr equals one attribute, user modifying entry in previously targeted branch'
</message>
@@ -1864,10 +1699,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr not equals one attribute, user modifying entry from targeted branch'
</message>
@@ -1880,10 +1711,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_delete3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr not equals one attribute, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -1924,10 +1751,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Ddelete Attribute Value - targetattr not equals one attribute, user modifying entry in previously targeted branch'
</message>
@@ -1988,10 +1811,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - write not allowed, user modifying entry from targeted branch'
</message>
@@ -2046,10 +1865,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - write not allowed, user modifying entry in previously targeted branch'
</message>
@@ -2113,10 +1928,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying entry from targeted branch'
</message>
@@ -2129,10 +1940,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targattrfilter) in entry from targeted branch'
</message>
@@ -2145,10 +1952,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying prohibited entry (by targattrfilter) from targeted branch'
</message>
@@ -2161,10 +1964,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_delete5.2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targetattr) in entry from targeted branch'
</message>
@@ -2205,10 +2004,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetattr and targattrfilter, user modifying entry in previously targeted branch'
</message>
@@ -2268,10 +2063,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter with three statements with or, none true, user modifying entry from targeted branch'
</message>
@@ -2312,10 +2103,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter with three statements with or, none true, user modifying entry in previously targeted branch'
</message>
@@ -2375,10 +2162,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter equals three statements with and, all statements false, user modifying entry from targeted branch'
</message>
@@ -2419,10 +2202,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Delete Attribute Value - targetfilter equals three statements with and, all statements false, user modifying entry in previously targeted branch'
</message>
@@ -2485,10 +2264,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - userdn not equals dn, user modifying entry from targeted branch'
</message>
@@ -2515,10 +2290,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - userdn not equals dn, user modifying entry from non-targeted branch'
</message>
@@ -2545,10 +2316,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - userdn not equals dn, user modifying entry in previously targeted branch'
</message>
@@ -2611,10 +2378,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present, user modifying entry from targeted branch'
</message>
@@ -2627,10 +2390,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -2671,10 +2430,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr equals one attribute not present, user modifying entry in previously targeted branch'
</message>
@@ -2738,10 +2493,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, user modifying entry from targeted branch'
</message>
@@ -2754,10 +2505,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, user modifying entry with second attribute value from targeted branch'
</message>
@@ -2770,10 +2517,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_allow-write_add3.1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -2814,10 +2557,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr not equals attribute, add multi-values, user modifying entry in previously targeted branch'
</message>
@@ -2878,10 +2617,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - write not allowed, user modifying entry from targeted branch'
</message>
@@ -2936,10 +2671,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - write not allowed, user modifying entry in previously targeted branch'
</message>
@@ -3003,10 +2734,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying entry from targeted branch'
</message>
@@ -3019,10 +2746,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targattrfilter) in entry from targeted branch'
</message>
@@ -3049,10 +2772,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targattrfilter_add5.2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying prohibited attr (by targetattr) in entry from targeted branch'
</message>
@@ -3093,10 +2812,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetattr and targattrfilter, user modifying entry in previously targeted branch'
</message>
@@ -3156,10 +2871,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with or, none true, user modifying entry from targeted branch'
</message>
@@ -3172,10 +2883,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with or, none true, user modifying entry from non-targeted branch'
</message>
@@ -3202,10 +2909,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with or, none true, user modifying entry in previously targeted branch'
</message>
@@ -3265,10 +2968,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with and, all statements false, user modifying entry from targeted branch'
</message>
@@ -3281,10 +2980,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/mod_targetfilter_add7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with and, all statements false, user modifying entry from non-targeted branch'
</message>
@@ -3311,10 +3006,6 @@
'entryToBeModified' : '%s/aci/aci_modify_entry/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify: Add Attribute Value - targetfilter not equals three statements with and, all statements false, user modifying entry in previously targeted branch'
</message>
@@ -3365,11 +3056,6 @@
'dsBaseDN' : 'o=Modify Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
index 590377f..92bed18 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci1.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci1.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 2'
</message>
@@ -135,10 +119,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 4'
</message>
@@ -151,10 +131,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 5'
</message>
@@ -181,10 +157,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 7'
</message>
@@ -197,10 +169,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 8'
</message>
@@ -213,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - Mod 9'
</message>
@@ -229,10 +193,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 1 - postamble, removing aci and entries'
</message>
@@ -245,11 +205,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
index 5a21e03..b3c1e27 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci11.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci11.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 2'
</message>
@@ -149,10 +133,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 5'
</message>
@@ -193,10 +173,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 8'
</message>
@@ -209,10 +185,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 11 - Mod 9'
</message>
@@ -239,11 +211,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
index aef1399..f1f414c 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci12.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci12.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 0'
</message>
@@ -159,10 +151,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 12 - Mod 6'
</message>
@@ -231,11 +219,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
index 5077b93..d1f8361 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci13.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci13.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 2'
</message>
@@ -121,10 +105,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 3'
</message>
@@ -151,10 +131,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 5'
</message>
@@ -167,10 +143,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 6'
</message>
@@ -197,10 +169,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 8'
</message>
@@ -213,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 13 - Mod 9'
</message>
@@ -243,11 +207,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
index dc4e315..8799c64 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci14.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci14.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 14 - Mod 0'
</message>
@@ -229,11 +221,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
index 93ac427..313afdc 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci15.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci15.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 1'
</message>
@@ -119,10 +107,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 3'
</message>
@@ -163,10 +147,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 6'
</message>
@@ -193,10 +173,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 8'
</message>
@@ -209,10 +185,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 15 - Mod 9'
</message>
@@ -239,11 +211,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
index 4b6ec42..cdb1911 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci16.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci16.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 0'
</message>
@@ -145,10 +137,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 16 - Mod 5'
</message>
@@ -231,11 +219,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
index f75f78a..0b0fa6a 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci2.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci2.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 4'
</message>
@@ -161,10 +149,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 6'
</message>
@@ -177,10 +161,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - Mod 7'
</message>
@@ -221,10 +201,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 2 - postamble, removing aci and entries'
</message>
@@ -237,11 +213,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
index f51ce55..5ce0967 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci21.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci21.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 2'
</message>
@@ -135,10 +119,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 4'
</message>
@@ -151,10 +131,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 5'
</message>
@@ -181,10 +157,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 7'
</message>
@@ -197,10 +169,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 8'
</message>
@@ -213,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - Mod 9'
</message>
@@ -229,10 +193,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 21 - postamble, removing aci and entries'
</message>
@@ -245,11 +205,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
index 123d97a..844de24 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci22.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci22.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 4'
</message>
@@ -161,10 +149,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 6'
</message>
@@ -177,10 +161,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - Mod 7'
</message>
@@ -221,10 +201,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 22 - postamble, removing aci and entries'
</message>
@@ -237,11 +213,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
index 2121b27..28a0456 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci23.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci23.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 2'
</message>
@@ -121,10 +105,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 3'
</message>
@@ -137,10 +117,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 4'
</message>
@@ -153,10 +129,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 5'
</message>
@@ -169,10 +141,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 6'
</message>
@@ -185,10 +153,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 7'
</message>
@@ -201,10 +165,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 8'
</message>
@@ -217,10 +177,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - Mod 9'
</message>
@@ -233,10 +189,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 23 - postamble, removing aci and entries'
</message>
@@ -249,11 +201,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
index 32a11e5..a4c0b7a 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci24.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci24.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 4'
</message>
@@ -175,10 +163,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - Mod 7'
</message>
@@ -219,10 +203,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 24 - postamble, removing aci and entries'
</message>
@@ -235,11 +215,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
index 8a6de6f..c8849e0 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci25.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci25.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 1'
</message>
@@ -119,10 +107,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 3'
</message>
@@ -135,10 +119,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 4'
</message>
@@ -165,10 +145,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 6'
</message>
@@ -181,10 +157,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 7'
</message>
@@ -197,10 +169,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 8'
</message>
@@ -213,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - Mod 9'
</message>
@@ -229,10 +193,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 25 - postamble, removing aci and entries'
</message>
@@ -245,11 +205,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
index 2a3ada7..6345055 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci26.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci26.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 4'
</message>
@@ -147,10 +135,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 5'
</message>
@@ -177,10 +161,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - Mod 7'
</message>
@@ -221,10 +201,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 26 - postamble, removing aci and entries'
</message>
@@ -237,11 +213,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
index 9591653..9e395c2 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci3.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci3.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 1'
</message>
@@ -105,10 +93,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 2'
</message>
@@ -121,10 +105,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 3'
</message>
@@ -137,10 +117,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 4'
</message>
@@ -153,10 +129,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 5'
</message>
@@ -169,10 +141,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 6'
</message>
@@ -185,10 +153,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 7'
</message>
@@ -201,10 +165,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 8'
</message>
@@ -217,10 +177,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - Mod 9'
</message>
@@ -233,10 +189,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 3 - postamble, removing aci and entries'
</message>
@@ -249,12 +201,7 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
index e833247..0e45fa5 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci4.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci4.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 4'
</message>
@@ -175,10 +163,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - Mod 7'
</message>
@@ -219,10 +203,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 4 - postamble, removing aci and entries'
</message>
@@ -235,11 +215,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
index 7b856cf..b2aed35 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci5.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci5.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 0'
</message>
@@ -89,10 +81,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod0.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 1'
</message>
@@ -119,10 +107,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 3'
</message>
@@ -135,10 +119,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 4'
</message>
@@ -165,10 +145,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 6'
</message>
@@ -181,10 +157,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 7'
</message>
@@ -197,10 +169,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 8'
</message>
@@ -213,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - Mod 9'
</message>
@@ -229,10 +193,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 5 - postamble, removing aci and entries'
</message>
@@ -245,12 +205,7 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
+
<call function="'testCase_Postamble'"/>
</sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
index 112b30e..3ec46a1 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_filter_tests_aci6.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -52,10 +52,6 @@
'entryToBeAdded' : '%s/aci/aci_modify_filter_tests/aci_startup_modify_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_aci6.ldif'
curr_aci=retrieve_aci('%s/aci/aci_modify_filter_tests/%s' % (local.data,curr_aci_ldif_file));
@@ -73,10 +69,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 0'
</message>
@@ -131,10 +123,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 4'
</message>
@@ -147,10 +135,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 5'
</message>
@@ -177,10 +161,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod6.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - Mod 7'
</message>
@@ -221,10 +201,6 @@
'entryToBeModified' : '%s/aci/aci_modify_filter_tests/mod9.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify Filter: ACI 6 - postamble, removing aci and entries'
</message>
@@ -237,11 +213,6 @@
'dsBaseDN' : 'o=Modify Filter Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml
index da3764b..f8e6bbd 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_modify_rdn.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -89,11 +89,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/aci/aci_modify_rdn/aci_startup_modrdn_tests.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -144,10 +139,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr=* and userdn=all, user modifying entry from targeted branch'
</message>
@@ -160,10 +151,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr=* and userdn=all, user searching targeted entry, new rdn'
</message>
@@ -233,10 +220,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr=* and userdn=all, user modifying entry in previously targeted branch'
</message>
@@ -301,10 +284,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, user modifying entry from targeted branch'
</message>
@@ -317,10 +296,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, user searching targeted entry, new rdn'
</message>
@@ -390,10 +365,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, admin deleting aci'
</message>
@@ -406,10 +377,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr=* and userdn=all, user modifying entry in previously targeted branch'
</message>
@@ -473,10 +440,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid, user modifying entry from targeted branch'
</message>
@@ -489,10 +452,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid, user searching targeted entry, new rdn'
</message>
@@ -562,10 +521,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes with uid, user modifying entry in previously targeted branch'
</message>
@@ -627,10 +582,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes without uid, user modifying entry from targeted branch'
</message>
@@ -671,10 +622,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr equals three attributes without uid, user modifying entry in previously targeted branch'
</message>
@@ -739,10 +686,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, user modifying entry from targeted branch'
</message>
@@ -755,10 +698,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, user searching targeted entry, new rdn'
</message>
@@ -828,10 +767,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, admin deleting aci'
</message>
@@ -844,10 +779,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes equals ou, user modifying entry in previously targeted branch'
</message>
@@ -908,10 +839,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes not equals ou, user modifying entry from targeted branch'
</message>
@@ -952,10 +879,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - targetattr with three attributes not equals ou, user modifying entry in previously targeted branch'
</message>
@@ -1020,10 +943,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, user modifying entry from targeted branch'
</message>
@@ -1036,10 +955,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry7.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, user searching targeted entry, new rdn'
</message>
@@ -1123,10 +1038,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - Multi ACIs, allow and deny, user modifying entry in previously targeted branch'
</message>
@@ -1193,10 +1104,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user modifying entry from targeted branch'
</message>
@@ -1209,10 +1116,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user searching targeted entry, new rdn'
</message>
@@ -1296,10 +1199,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci8.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user restoring branch in previously targeted branch'
</message>
@@ -1312,10 +1211,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, admin deleting aci'
</message>
@@ -1328,10 +1223,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user modifying entry in previously targeted branch'
</message>
@@ -1393,10 +1284,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, delete old rdn, user modifying entry from targeted branch'
</message>
@@ -1437,10 +1324,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, delete old rdn, user modifying entry in previously targeted branch'
</message>
@@ -1505,10 +1388,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn, user modifying entry from targeted branch'
</message>
@@ -1521,10 +1400,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry10.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn, user searching targeted entry, new rdn'
</message>
@@ -1594,10 +1469,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals uid, dont delete old rdn, user modifying entry in previously targeted branch'
</message>
@@ -1661,10 +1532,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn, user modifying entry from targeted branch'
</message>
@@ -1705,10 +1572,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Leaf - targetattr with three attributes not equals sn and cn, dont delete old rdn, user modifying entry in previously targeted branch'
</message>
@@ -1773,10 +1636,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, user modifying entry from targeted branch'
</message>
@@ -1789,10 +1648,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry21.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, user searching targeted entry, new rdn'
</message>
@@ -1862,10 +1717,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, admin deleting aci'
</message>
@@ -1878,10 +1729,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou, user modifying entry in previously targeted branch'
</message>
@@ -1948,10 +1795,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, user modifying entry from targeted branch'
</message>
@@ -1964,10 +1807,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_entry22.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, user searching targeted entry, new rdn'
</message>
@@ -2051,10 +1890,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/replace_modrdn_aci22.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, deny write on new branch, user restoring branch in previously targeted branch'
</message>
@@ -2067,10 +1902,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/modrdn_restore4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, admin deleting aci'
</message>
@@ -2083,10 +1914,6 @@
'entryToBeModified' : '%s/aci/aci_modify_rdn/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Modify RDN: Branch - Multi ACIs, targattrfilters add:ou, del:ou 2, user modifying entry in previously targeted branch'
</message>
@@ -2135,11 +1962,6 @@
'dsBaseDN' : 'o=Modify RDN Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
index e84a530..2c9b692 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_proxy_auth.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -639,10 +639,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for adds, one proxied user, user searching targeted entry'
</message>
@@ -732,10 +728,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for adds, one proxied user, proxied user searching targeted entry'
</message>
@@ -798,10 +790,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for adds, one proxied user, user searching targeted entry'
</message>
@@ -873,10 +861,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches, one proxied user, user searching targeted entry'
</message>
@@ -972,10 +956,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches, one proxied user, proxied user searching targeted entry'
</message>
@@ -1044,10 +1024,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches, one proxied user, user searching targeted entry'
</message>
@@ -1120,10 +1096,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches reads separate level, one proxied user, user searching targeted entry'
</message>
@@ -1219,10 +1191,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches reads separate level, one proxied user, proxied user searching targeted entry'
</message>
@@ -1291,10 +1259,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches reads separate level, one proxied user, admin deleting both acis'
</message>
@@ -1307,10 +1271,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user for searches reads separate level, one proxied user, user searching targeted entry'
</message>
@@ -1383,10 +1343,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: many users with wildcard, one proxied user, user searching targeted entry'
</message>
@@ -1488,10 +1444,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: many users with wildcard, one proxied user, proxied user searching targeted entry'
</message>
@@ -1566,10 +1518,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: many users with wildcard, one proxied user, user searching targeted entry'
</message>
@@ -1642,10 +1590,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, many proxied users with wildcard, user searching targeted entry'
</message>
@@ -1741,10 +1685,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, many proxied users with wildcard, proxied user searching targeted entry'
</message>
@@ -1813,10 +1753,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, many proxied users with wildcard, user searching targeted entry'
</message>
@@ -1889,10 +1825,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, one bad proxied user, user searching targeted entry'
</message>
@@ -2014,10 +1946,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, one bad proxied user, proxied user searching targeted entry'
</message>
@@ -2082,10 +2010,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: one user, one bad proxied user, user searching targeted entry'
</message>
@@ -2159,10 +2083,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: Directory Manager as proxy, user searching targeted entry'
</message>
@@ -2254,10 +2174,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/add_proxy_auth_dm.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
curr_aci_ldif_file = 'add_proxy_aci_dm.ldif'
curr_aci=retrieve_aci('%s/aci/aci_proxy_auth/%s' % (local.data,curr_aci_ldif_file));
@@ -2275,10 +2191,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: Directory Manager as proxy, proxied user searching targeted entry'
</message>
@@ -2353,10 +2265,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_proxy_auth_dm.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: Directory Manager as proxy, admin deleting both acis'
</message>
@@ -2369,10 +2277,6 @@
'entryToBeModified' : '%s/aci/aci_proxy_auth/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Proxy Auth: Directory Manager as proxy, user searching targeted entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
index 9f4838f..4a8836d 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_rdn_wildcards.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -93,10 +93,6 @@
'entryToBeAdded' : '%s/aci/aci_rdn_wildcards/aci_startup_rdn_wildcard_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: Preamble - user searching targeted entry, level one'
</message>
@@ -213,10 +209,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, single entry, user searching targeted entry'
</message>
@@ -254,10 +246,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, single entry, user searching previously targeted entry'
</message>
@@ -326,10 +314,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, several entries, user searching targeted entry'
</message>
@@ -379,10 +363,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, several entries, user searching previously targeted entry'
</message>
@@ -451,10 +431,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, several entries, shorthand, user searching targeted entry'
</message>
@@ -504,10 +480,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type wildcard, several entries, shorthand, user searching previously targeted entry'
</message>
@@ -575,10 +547,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, user searching targeted entry'
</message>
@@ -616,10 +584,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, user searching previously targeted entry'
</message>
@@ -687,10 +651,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level allow, user searching targeted entry'
</message>
@@ -728,10 +688,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level allow, user searching previously targeted entry'
</message>
@@ -799,10 +755,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, two level deny, user searching targeted entry'
</message>
@@ -840,10 +792,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, two level deny, user searching previously targeted entry'
</message>
@@ -911,10 +859,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level deny, user searching targeted entry'
</message>
@@ -952,10 +896,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, two level deny, user searching previously targeted entry'
</message>
@@ -1023,10 +963,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, three level deny, user searching targeted entry'
</message>
@@ -1064,10 +1000,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard, single entry, three level deny, user searching previously targeted entry'
</message>
@@ -1135,10 +1067,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, three level deny, user searching targeted entry'
</message>
@@ -1176,10 +1104,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-rdn wildcard, single entry, three level deny, user searching previously targeted entry'
</message>
@@ -1247,10 +1171,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type and multiple-whole-rdn wildcard, several entries, shorthand, user searching targeted entry'
</message>
@@ -1300,10 +1220,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with whole-type and multiple-whole-rdn wildcard, several entries, shorthand, user searching previously targeted entry'
</message>
@@ -1371,10 +1287,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards, three level deny, user searching targeted entry'
</message>
@@ -1412,10 +1324,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards, three level deny, user searching previously targeted entry'
</message>
@@ -1483,10 +1391,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards with bad branch, user searching targeted entry'
</message>
@@ -1524,10 +1428,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with several multiple-whole-rdn wildcards with bad branch, user searching previously targeted entry'
</message>
@@ -1595,10 +1495,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard syntax, multiple spaces, user searching targeted entry'
</message>
@@ -1636,10 +1532,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with multiple-whole-rdn wildcard syntax, multiple spaces, user searching previously targeted entry'
</message>
@@ -1934,10 +1826,6 @@
'entryToBeModified' : '%s/aci/aci_rdn_wildcards/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: RDN Wildcards: DN with usrdn syntax, wildcard notation for uid, user searching previously targeted entry'
</message>
@@ -1996,11 +1884,6 @@
'dsBaseDN' : 'o=RDN Wildcard Tests, o=ACI Tests,dc=example,dc=com' ,
'extraParams' : '-x'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
index ee64a01..936a0d1 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targattrfilter.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -187,10 +187,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title, user adding title to targeted entry'
</message>
@@ -203,10 +199,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title, user adding prohibited title to targeted entry'
</message>
@@ -233,10 +225,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_telephonenumber1.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title, user adding title to non-targeted entry'
</message>
@@ -263,10 +251,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title, user adding carlicense to previously targeted entry'
</message>
@@ -331,10 +315,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, user adding telephonenumber to targeted entry'
</message>
@@ -347,10 +327,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/add_telephonenumber2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, user deleting title from targeted entry'
</message>
@@ -377,10 +353,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_roomnumber2.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, user deleting roomnumber from non-targeted entry'
</message>
@@ -407,10 +379,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals del:roomnumber, user deleting fax number from previously targeted entry'
</message>
@@ -473,10 +441,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in targeted entry'
</message>
@@ -489,10 +453,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l3.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing mail in targeted entry'
</message>
@@ -533,10 +493,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in previously targeted entry'
</message>
@@ -599,10 +555,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:st,del:st, user replacing st in targeted entry'
</message>
@@ -629,10 +581,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail4.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:st,del:st, user replacing st in non-targeted entry'
</message>
@@ -659,10 +607,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:st,del:st, user replacing st in previously targeted entry'
</message>
@@ -725,10 +669,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in targeted entry'
</message>
@@ -741,10 +681,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_l5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing mail in targeted entry'
</message>
@@ -757,10 +693,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_mail5.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in non-targeted entry'
</message>
@@ -787,10 +719,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:l,del:l, user replacing l in previously targeted entry'
</message>
@@ -852,10 +780,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in targeted entry'
</message>
@@ -868,10 +792,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/replace_street17.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing mail in targeted entry'
</message>
@@ -912,10 +832,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:street,del:street wildcard only, street not present, user replacing street in previously targeted entry'
</message>
@@ -977,10 +893,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title,del:title with wildcards, user replacing title in targeted entry'
</message>
@@ -1021,10 +933,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter equals add:title,del:title with wildcards, user replacing title in previously targeted entry'
</message>
@@ -1206,11 +1114,6 @@
'expectedRC' : 21
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1295,11 +1198,6 @@
'expectedRC' : 21
}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -1517,10 +1415,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter with very long comment portion, user adding title to targeted entry'
</message>
@@ -1533,10 +1427,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/add_title18.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter with very long comment portion, admin deleting aci'
</message>
@@ -1549,10 +1439,6 @@
'entryToBeModified' : '%s/aci/aci_targattrfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targattrfilter: Targattrfilter with very long comment portion, user adding carlicense to previously targeted entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
index 5ced9b8..120afe8 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_target.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -184,10 +184,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, user searching targeted entry'
</message>
@@ -248,10 +244,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, user searching previously targeted entry'
</message>
@@ -321,10 +313,6 @@
'entryToBeAdded' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN - new branch, user searching targeted entry'
</message>
@@ -383,10 +371,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci_from_entries.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN - new branch, user searching previously targeted entry'
</message>
@@ -423,11 +407,6 @@
'extraParams' : '-x'}
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -473,10 +452,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with trailing wildcard, user searching targeted entry'
</message>
@@ -537,10 +512,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with trailing wildcard, user searching previously targeted entry'
</message>
@@ -609,10 +580,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with leading wildcard, user searching targeted entry'
</message>
@@ -673,10 +640,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with leading wildcard, user searching previously targeted entry'
</message>
@@ -745,10 +708,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with internal wildcard, user searching targeted entry'
</message>
@@ -809,10 +768,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with internal wildcard, user searching previously targeted entry'
</message>
@@ -881,10 +836,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with multiple wildcards, user searching targeted entry'
</message>
@@ -945,10 +896,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with multiple wildcards, user searching previously targeted entry'
</message>
@@ -1151,10 +1098,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN Below Entry, user searching targeted entry'
</message>
@@ -1215,10 +1158,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN Below Entry, user searching previously targeted entry'
</message>
@@ -1561,10 +1500,6 @@
'expectedRC' : 21}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Keyword version mispelled - check aci'
</message>
@@ -1638,10 +1573,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, user searching targeted entry'
</message>
@@ -1691,10 +1622,6 @@
'changetype' : 'add' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, user searching targeted entry'
</message>
@@ -1734,10 +1661,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, user searching targeted entry'
</message>
@@ -1783,10 +1706,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, user searching targeted entry'
</message>
@@ -1826,10 +1745,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, admin deleting deny aci'
</message>
@@ -1845,10 +1760,6 @@
'changetype' : 'delete' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable ACIs, user searching previously targeted entry'
</message>
@@ -1938,10 +1849,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable global ACIs, user searching targeted entry'
</message>
@@ -1987,10 +1894,6 @@
'changetype' : 'replace' }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: enable and disable global ACIs, user searching previously targeted entry'
</message>
@@ -2060,10 +1963,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals all, user searching targeted entry as authenticated user'
</message>
@@ -2122,10 +2021,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals all, user searching previously targeted entry'
</message>
@@ -2194,10 +2089,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals anyone, user searching targeted entry as authenticated user'
</message>
@@ -2256,10 +2147,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equals anyone, user searching previously targeted entry'
</message>
@@ -2328,10 +2215,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn not equals all, user searching targeted entry as authenticated user'
</message>
@@ -2390,10 +2273,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn not equals all, user searching previously targeted entry'
</message>
@@ -2462,10 +2341,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self, user searching targeted entry as authenticated user'
</message>
@@ -2526,10 +2401,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self, user searching previously targeted entry'
</message>
@@ -2598,10 +2469,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard, user searching targeted entry as authenticated user'
</message>
@@ -2662,10 +2529,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard, user searching previously targeted entry'
</message>
@@ -2734,10 +2597,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, user searching targeted entry as authenticated user'
</message>
@@ -2798,10 +2657,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, user searching previously targeted entry'
</message>
@@ -2870,10 +2725,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, deny, user searching targeted entry as authenticated user'
</message>
@@ -2934,10 +2785,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, deny, user searching previously targeted entry'
</message>
@@ -2951,11 +2798,6 @@
'dsFilter' : 'objectclass=*' ,
'attributes' : 'cn sn uid'}
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -3002,10 +2844,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, allow and deny, user searching targeted entry as authenticated user'
</message>
@@ -3066,10 +2904,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with userdn equal self with wildcard and filter, allow and deny, user searching previously targeted entry'
</message>
@@ -3138,10 +2972,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: userdn equals self - modify operational attributes, modify 1 '
</message>
@@ -3154,10 +2984,6 @@
'entryToBeModified' : '%s/aci/aci_target/mod_entry31.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: userdn equals self - modify operational attributes, modify 2'
</message>
@@ -3198,10 +3024,6 @@
'entryToBeModified' : '%s/aci/aci_target/mod_entry31c.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: userdn equals self - modify operational attributes, admin deleting aci'
</message>
@@ -3213,11 +3035,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -3268,10 +3085,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, admin modifying entry'
</message>
@@ -3284,10 +3097,6 @@
'entryToBeModified' : '%s/aci/aci_target/mod_entry32.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, user searching targeted entry'
</message>
@@ -3459,10 +3268,6 @@
'entryToBeModified' : '%s/aci/aci_target/mod_entry32c.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: search for operational attributes, admin deleting aci'
</message>
@@ -3474,11 +3279,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -3525,10 +3325,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with comma, user searching targeted entry'
</message>
@@ -3601,10 +3397,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN with comma, user searching previously targeted entry'
</message>
@@ -3673,10 +3465,6 @@
'entryToBeModified' : '%s/aci/aci_target/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, default targetattr, user searching targeted entry'
</message>
@@ -3737,10 +3525,6 @@
'entryToBeModified' : '%s/aci/aci_target/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Target Equals DN, default targetattr, user searching previously targeted entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
index e797458..786f4b7 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -181,10 +181,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals One Attribute, user searching targeted entry and targeted attribute'
</message>
@@ -257,10 +253,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals One Attribute, user searching previously targeted entry and targeted attribute'
</message>
@@ -330,10 +322,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals One Attribute, user searching targeted entry and targeted attribute'
</message>
@@ -406,10 +394,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals One Attribute, user searching previously targeted entry and targeted attribute'
</message>
@@ -479,10 +463,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals Three Attributes, user searching targeted entry and targeted attributes'
</message>
@@ -567,10 +547,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Equals Three Attributes, user searching previously targeted entry and targeted attributes'
</message>
@@ -641,10 +617,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals Three Attributes, user searching targeted entry and targeted attributes'
</message>
@@ -729,10 +701,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr Not Equals Three Attributes, user searching previously targeted entry and targeted attributes'
</message>
@@ -798,10 +766,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Bad Targetattr, user searching targeted entry and targeted attribute'
</message>
@@ -868,10 +832,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Bad Targetattr, user searching previously targeted entry and targeted attribute'
</message>
@@ -1132,10 +1092,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr With Spaces, user searching targeted entry and targeted attribute'
</message>
@@ -1208,10 +1164,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetattr: Targetattr With Spaces, user searching previously targeted entry and targeted attribute'
</message>
@@ -1342,10 +1294,6 @@
'entryToBeModified' : '%s/aci/aci_targetattr/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Target: Targetattr Not Equals Wildcard, user searching previously targeted entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
index 499a2f9..c51fa9e 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetcontrol.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -120,11 +120,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
<call function="'testCase_Postamble'"/>
</sequence>
@@ -170,10 +165,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching targeted entry'
</message>
@@ -248,10 +239,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching previously targeted entry'
</message>
@@ -339,10 +326,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching targeted entry'
</message>
@@ -419,10 +402,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching previously targeted entry'
</message>
@@ -512,10 +491,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching targeted entry'
</message>
@@ -590,10 +565,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetcontrol: Basic - search, user searching previously targeted entry'
</message>
@@ -654,10 +625,6 @@
'entryToBeModified' : '%s/aci/aci_targetcontrol/del_effrights_aci.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<script>
allow_aci='(targetcontrol=\"*\") (version 3.0; acl \"allow control access\"; allow(read) userdn=\"ldap:///anyone\";)'
</script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
index 28d481e..fe0b279 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetfilter.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -182,10 +182,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, user searching targeted entry'
</message>
@@ -288,10 +284,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement, user searching previously targeted entry'
</message>
@@ -363,10 +355,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 2, user searching targeted entry'
</message>
@@ -469,10 +457,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 2, user searching previously targeted entry'
</message>
@@ -542,10 +526,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 3, user searching targeted entry'
</message>
@@ -622,10 +602,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals One Statement 3, user searching previously targeted entry'
</message>
@@ -695,10 +671,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals One Statement, user searching targeted entry'
</message>
@@ -801,10 +773,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals One Statement, user searching previously non-targeted entry in ACI branch'
</message>
@@ -875,10 +843,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, user searching targeted entry'
</message>
@@ -981,10 +945,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, one true, user searching previously targeted entry'
</message>
@@ -1055,10 +1015,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, user searching targeted entry'
</message>
@@ -1161,10 +1117,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With or, one true, user searching previously targeted entry'
</message>
@@ -1233,10 +1185,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, user searching targeted entry'
</message>
@@ -1297,10 +1245,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With or, none true, user searching previously targeted entry'
</message>
@@ -1370,10 +1314,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, user searching targeted entry'
</message>
@@ -1434,10 +1374,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, one true, user searching previously targeted entry'
</message>
@@ -1508,10 +1444,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, user searching targeted entry'
</message>
@@ -1614,10 +1546,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With and, all true, user searching previously targeted entry'
</message>
@@ -1688,10 +1616,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, user searching targeted entry'
</message>
@@ -1794,10 +1718,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Not Equals Three Statements With and, all true, user searching previously targeted entry'
</message>
@@ -1868,10 +1788,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, user searching targeted entry'
</message>
@@ -1974,10 +1890,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard and or, one true, user searching previously targeted entry'
</message>
@@ -2048,10 +1960,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, user searching targeted entry'
</message>
@@ -2154,10 +2062,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Two Wildcards and or, one true, user searching previously targeted entry'
</message>
@@ -2228,10 +2132,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, user searching targeted entry'
</message>
@@ -2334,10 +2234,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Wildcard With and, all true, user searching previously targeted entry'
</message>
@@ -2408,10 +2304,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, user searching targeted entry'
</message>
@@ -2514,10 +2406,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter Equals Three Statements With Three Wildcards With and, all true, user searching previously targeted entry'
</message>
@@ -2585,10 +2473,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Extra Spaces, user searching targeted entry'
</message>
@@ -2625,10 +2509,6 @@
'entryToBeModified' : '%s/aci/aci_targetfilter/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetfilter: Targetfilter With Extra Spaces, user searching previously targeted entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
index f593af2..7519fb3 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci_targetscope.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -102,11 +102,6 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'entryToBeAdded' : '%s/aci/aci_targetscope/aci_startup_targetscope.ldif' % remote.data }
</call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
<call function="'testCase_Postamble'"/>
@@ -152,10 +147,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: base, user searching targeted entry'
</message>
@@ -267,10 +258,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: base, user searching previously targeted entry'
</message>
@@ -339,10 +326,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: onelevel, user searching targeted entry'
</message>
@@ -460,10 +443,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: onelevel, user searching previously targeted entry'
</message>
@@ -532,10 +511,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: subtree, user searching targeted entry'
</message>
@@ -659,10 +634,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: subtree, user searching previously targeted entry'
</message>
@@ -731,10 +702,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: subordinate, user searching targeted entry'
</message>
@@ -858,10 +825,6 @@
'entryToBeModified' : '%s/aci/aci_targetscope/del_aci.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: subordinate, user searching previously targeted entry'
</message>
@@ -1043,10 +1006,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Targetscope: Resetting Search Global ACI'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml
index c9a8106..baaa1d6 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/global_acis.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -204,10 +204,6 @@
'entryToBeModified' : '%s/aci/global_acis/mod_modifier_entry1.ldif' % (remote.data) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Global: Search, user searching all operational attributes of an entry'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
index fd99aa5..c674baa 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/multiple_aci_tests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -91,10 +91,6 @@
'entryToBeAdded' : '%s/aci/multiple_aci_tests/aci_startup_mult_aci_tests.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Preamble - Removing Search Global ACI'
</message>
@@ -202,10 +198,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, user searching targeted entry'
</message>
@@ -308,10 +300,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, user searching previously targeted entry'
</message>
@@ -382,10 +370,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching targeted entry'
</message>
@@ -506,10 +490,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching previously targeted entry'
</message>
@@ -580,10 +560,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, user searching targeted entry'
</message>
@@ -704,10 +680,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, user searching previously targeted entry'
</message>
@@ -778,10 +750,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, user searching targeted entry'
</message>
@@ -902,10 +870,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, user searching previously targeted entry'
</message>
@@ -975,10 +939,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny, user searching targeted entry'
</message>
@@ -1063,10 +1023,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-one entry, deny, user searching previously targeted entry'
</message>
@@ -1136,10 +1092,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny, user searching targeted entry'
</message>
@@ -1224,10 +1176,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, deny, user searching previously targeted entry'
</message>
@@ -1297,10 +1245,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny, user searching targeted entry'
</message>
@@ -1385,10 +1329,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 2, deny, user searching previously targeted entry'
</message>
@@ -1459,10 +1399,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny, user searching targeted entry'
</message>
@@ -1565,10 +1501,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 3, deny, user searching previously targeted entry'
</message>
@@ -1639,10 +1571,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching targeted entry'
</message>
@@ -1763,10 +1691,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters, one aci-two entries 1, user searching previously targeted entry'
</message>
@@ -1837,10 +1761,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targeattr, deny one attr, user searching targeted entry'
</message>
@@ -1961,10 +1881,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targeattr, deny one attr, user searching previously targeted entry'
</message>
@@ -2035,10 +1951,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr with not equals, user searching targeted entry'
</message>
@@ -2163,10 +2075,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr with not equals, user searching previously targeted entry'
</message>
@@ -2237,10 +2145,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with missing read, user searching targeted entry'
</message>
@@ -2349,10 +2253,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read missing read, user searching previously targeted entry'
</message>
@@ -2423,10 +2323,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read, user searching targeted entry'
</message>
@@ -2547,10 +2443,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read, user searching previously targeted entry'
</message>
@@ -2621,10 +2513,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search, user searching targeted entry'
</message>
@@ -2727,10 +2615,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_search.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Different targetfilters and targetattr, separate search-read with deny search, user searching previously targeted entry'
</message>
@@ -2801,10 +2685,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l, user replacing l in targeted entry'
</message>
@@ -2817,10 +2697,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l31.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l, user replacing mail in targeted entry'
</message>
@@ -2861,10 +2737,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with add:l and del:l, user replacing l in previously targeted entry'
</message>
@@ -2925,10 +2797,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l, user replacing l in targeted entry'
</message>
@@ -2983,10 +2851,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with deny add:l and allow del:l, user replacing l in previously targeted entry'
</message>
@@ -3047,10 +2911,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l, user replacing l in targeted entry'
</message>
@@ -3105,10 +2965,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targattrfilters with allow add:l and deny del:l, user replacing l in previously targeted entry'
</message>
@@ -3167,10 +3023,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs, user modifying entry from targeted branch'
</message>
@@ -3183,10 +3035,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l34.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3227,10 +3075,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs, user modifying entry in previously targeted branch'
</message>
@@ -3290,10 +3134,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with not equals, user modifying entry from targeted branch'
</message>
@@ -3306,10 +3146,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with not equals, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3322,10 +3158,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_title35.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with not equals, user modifying entry from non-targeted branch'
</message>
@@ -3338,10 +3170,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l35a.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with not equals, admin deleting aci'
</message>
@@ -3354,10 +3182,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with not equals, user modifying entry in previously targeted branch'
</message>
@@ -3418,10 +3242,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, user modifying entry from targeted branch'
</message>
@@ -3434,10 +3254,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l36.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3492,10 +3308,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with equals and not equals, user modifying entry in previously targeted branch'
</message>
@@ -3556,10 +3368,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, user modifying entry from targeted branch'
</message>
@@ -3572,10 +3380,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l37.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3630,10 +3434,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with not equals, user modifying entry in previously targeted branch'
</message>
@@ -3693,10 +3493,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, user modifying entry from targeted branch'
</message>
@@ -3709,10 +3505,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/replace_l38.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, user modifying prohibited attr in entry from targeted branch'
</message>
@@ -3767,10 +3559,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs and targattrfilters with deny, user modifying entry in previously targeted branch'
</message>
@@ -3830,10 +3618,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/%s' % (remote.data,curr_aci_ldif_file) }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , user modifying entry from targeted branch'
</message>
@@ -3902,10 +3686,6 @@
'entryToBeModified' : '%s/aci/multiple_aci_tests/del_aci_modify.ldif' % remote.data }
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Separate targetattrs with deny and targattrfilters , user modifying entry in previously targeted branch'
</message>
@@ -4005,10 +3785,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Postamble - delete branch, o=Modify Tests'
</message>
@@ -4022,10 +3798,6 @@
'extraParams' : '-x'}
</call>
- <if expr="RC != 0">
- <tcstatus result="'fail'"/>
- </if>
-
<message>
'ACI: Multiple ACIs: Postamble - Resetting Search Global ACI'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
index fb839e6..51ec219 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/backends.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Copyright 2006-2010 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="main_backends"/>
@@ -54,7 +54,8 @@
suiteList = []
suiteList.append('import')
suiteList.append('import-tasks')
- suiteList.append('export')
+ if not IPS_PKG:
+ suiteList.append('export')
suiteList.append('export-tasks')
suiteList.append('backup')
suiteList.append('restore')
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
index 79c857e..744fe88 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="main_dbparams"/>
@@ -94,6 +94,7 @@
testsList.append('backends_dbparams_017')
testsList.append('backends_dbparams_018')
testsList.append('backends_dbparams_019')
+ testsList.append('backends_dbparams_019_1')
testsList.append('backends_dbparams_020')
testsList.append('backends_dbparams_021')
testsList.append('backends_dbparams_022')
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
index d774f9b..7e5e539 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/dbparams/dbparams_tests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -943,21 +943,139 @@
<!--- Test Case information
#@TestMarker Backend Dbparams Tests
- #@TestName Dbparams: db-txn-no-sync
+ #@TestName Dbparams: db-txn-no-sync_not_changed
+ #@TestIssue none
+ #@TestPurpose Ensure that db-txn-no-sync could not be changed
+ if db-txn-write-no-sync is set to true (default)
+ #@TestPreamble none
+ #@TestStep Call cannot_change function
+ #@TestPostamble none
+ #@TestResult Success if the db param has not been changed
+ -->
+ <function name="backends_dbparams_019" scope="local">
+ <testcase name="getTestCaseName('db-txn-no-sync_not_changed')">
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Ensure that db-txn-no-sync could not be changed if \
+ db-txn-write-no-sync is set to true (default)'
+ </message>
+
+ <!-- Try to change the property -->
+ <script>
+ options = '--advanced --backend-name userRoot --set db-txn-no-sync:true'
+ </script>
+ <message>
+ '===== options = %s' % options
+ </message>
+ <call function="'dsconfig'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'set-backend-prop' ,
+ 'optionsString' : options ,
+ 'expectedRC' : 1
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <!-- Ensure we get the correct error message -->
+ <message>
+ '===== Looking for appropriate error message'
+ </message>
+ <script>
+ expString = 'Configuration attributes'
+ </script>
+ <message>
+ '===== expString = %s' % expString
+ </message>
+ <call function="'searchString'">
+ {
+ 'returnString' : returnString ,
+ 'expectedString' : expString
+ }
+ </call>
+ <script>
+ expString = 'ds-cfg-db-txn-no-sync and ds-cfg-db-txn-write-no-sync are mutually'
+ </script>
+ <message>
+ '===== expString = %s' % expString
+ </message>
+ <call function="'searchString'">
+ {
+ 'returnString' : returnString ,
+ 'expectedString' : expString
+ }
+ </call>
+ <script>
+ expString = 'exclusive and cannot be both set at the same time'
+ </script>
+ <message>
+ '===== expString = %s' % expString
+ </message>
+ <call function="'searchString'">
+ {
+ 'returnString' : returnString ,
+ 'expectedString' : expString
+ }
+ </call>
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+
+ </try>
+
+ </testcase>
+ </function>
+
+ <!--- Test Case information
+ #@TestMarker Backend Dbparams Tests
+ #@TestName Dbparams: db-txn-no-sync_changed
#@TestIssue none
#@TestPurpose Ensure that db-txn-no-sync could be changed
+ if db-txn-write-no-sync is set to false
#@TestPreamble none
#@TestStep Call can_change function
#@TestPostamble none
#@TestResult Success if the db param has been changed
-->
- <function name="backends_dbparams_019" scope="local">
- <testcase name="getTestCaseName('db-txn-no-sync')">
+ <function name="backends_dbparams_019_1" scope="local">
+ <testcase name="getTestCaseName('db-txn-no-sync_changed')">
<try>
<sequence>
<call function="'testCase_Preamble'"/>
<message>
- 'Ensure that db-txn-no-sync could be changed'
+ 'Set db-txn-write-no-sync to false'
+ </message>
+ <script>
+ modifs = '--backend-name userRoot --set db-txn-write-no-sync:"false"'
+ </script>
+ <call function="'dsconfig'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'set-backend-prop' ,
+ 'optionsString' : modifs ,
+ 'expectedRC' : 0
+ }
+ </call>
+
+ <message>
+ 'Ensure that db-txn-no-sync could be changed if \
+ db-txn-write-no-sync is set to false'
</message>
<call function="'can_change'">
{
@@ -965,9 +1083,26 @@
'propValue' : 'true'
}
</call>
+
+ <message>
+ 'Set db-txn-write-no-sync to true (default)'
+ </message>
+ <script>
+ modifs = '--backend-name userRoot --set db-txn-write-no-sync:"true"'
+ </script>
+ <call function="'dsconfig'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'subcommand' : 'set-backend-prop' ,
+ 'optionsString' : modifs ,
+ 'expectedRC' : 0
+ }
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
-
+
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
<message log="1" level="'fatal'">
'%s: Test failed. eInfo(%s)' % (eType,eInfo)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
index 9229892..1d89fd6 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks_tests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -104,6 +104,13 @@
<call function="'StartDsWithScript'"/>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<script>
options=[]
options.append('--backend-name "nonDefault"')
@@ -138,6 +145,13 @@
<call function="'StartDsWithScript'"/>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
</sequence>
<catch exception="'STAXException.*'" typevar="eType" var="eInfo">
@@ -1395,6 +1409,13 @@
<call function="'StartDsWithScript'"/>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<message>
'Backend ExportTasks19: Count entries in subtree ou=people,dc=example,dc=com'
</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
index 7acdbca..495b15a 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/import/import_tests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -102,6 +102,13 @@
<call function="'StartDsWithScript'"/>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
<script>
options=[]
options.append('--backend-name "nonDefault"')
@@ -1184,7 +1191,8 @@
'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
'dsReplaceExisting' : 'TRUE',
- 'dsBackEnd' : DIRECTORY_INSTANCE_BE
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
+ 'knownIssue' : '6927338'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
index 5c8f38d..87b22a8 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_verify-index_checkbehavior.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -232,7 +232,7 @@
{
'dsBaseDN' : 'dc=com' ,
'dsIndexList' : [ 'uid' ] ,
- 'dsClean' : 'True'
+ 'dsClean' : 'True'
}
</call>
@@ -243,7 +243,8 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'Checked 1000 records and found 0 error'
+ 'expectedString' : 'Checked 1000 records and found 0 error' ,
+ 'issue' : '6926830'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml b/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
index db0e692..d5df20d 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr.xml
@@ -82,16 +82,31 @@
</script>
<!-- List of Test Cases -->
- <!-- Short tests: tests 001 to -->
- <!-- Long tests: tests -->
+ <!-- Short tests: tests 001 to 006, 011, 012, 020 -->
+ <!-- Long tests: tests 007 to 010, 014 to 019, 021 -->
<script>
testsList=[]
testsList.append('core_collectiveattr_001')
testsList.append('core_collectiveattr_002')
- #testsList.append('core_collectiveattr_003')
- #testsList.append('core_collectiveattr_004')
- #testsList.append('core_collectiveattr_005')
- #testsList.append('core_collectiveattr_006')
+ testsList.append('core_collectiveattr_003')
+ testsList.append('core_collectiveattr_004')
+ testsList.append('core_collectiveattr_005')
+ testsList.append('core_collectiveattr_006')
+ testsList.append('core_collectiveattr_007')
+ testsList.append('core_collectiveattr_008')
+ testsList.append('core_collectiveattr_009')
+ testsList.append('core_collectiveattr_010')
+ testsList.append('core_collectiveattr_011')
+ testsList.append('core_collectiveattr_012')
+ #testsList.append('core_collectiveattr_013')
+ testsList.append('core_collectiveattr_014')
+ testsList.append('core_collectiveattr_015')
+ testsList.append('core_collectiveattr_016')
+ testsList.append('core_collectiveattr_017')
+ testsList.append('core_collectiveattr_018')
+ testsList.append('core_collectiveattr_019')
+ testsList.append('core_collectiveattr_020')
+ testsList.append('core_collectiveattr_021')
</script>
<!-- Execute the Tests -->
diff --git a/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml b/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
index 554a48c..69f3657 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/core/collectiveattr/core_collectiveattr_tests.xml
@@ -43,7 +43,7 @@
#@TestResult Test is successful if the result code is 0
-->
<function name="core_collectiveattr_001" scope="local">
- <testcase name="getTestCaseName('Create and add a Collective Attribute')">
+ <testcase name="getTestCaseName('core_collectiveattr_001: Create and add a Collective Attribute')">
<sequence>
<try>
<sequence>
@@ -152,7 +152,7 @@
</testcase>
</function>
- <!--- Test Case : Core : Collective Attributes : -->
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_002 -->
<!--- Test Case information
#@TestMarker Schema
#@TestName Core : Collective Attributes
@@ -160,12 +160,12 @@
#@TestPurpose Modify the value of the collective attribute
#@TestPreamble
#@TestSteps Modify the value of the collective attribute secretary
- #@TestSteps Verify in one entry the attribute value has changed.
+ #@TestSteps Verify in 2 entries the attribute value has changed.
#@TestPostamble
#@TestResult Test is successful if the result code is 0
-->
<function name="core_collectiveattr_002" scope="local">
- <testcase name="getTestCaseName('Modify the value of the Collective Attribute ')">
+ <testcase name="getTestCaseName('core_collectiveattr_002: Modify the value of the Collective Attribute ')">
<sequence>
<try>
<sequence>
@@ -181,7 +181,7 @@
targetDN2='uid=abergin,ou=Europe,%s' % baseDN
</script>
- <message>'++ Add collective attribute secretary, should pass'</message>
+ <message>'++ Modify collective attribute secretary, should pass'</message>
<call function="'ldapModifyWithScript'">
{
'dsAdd' : 'True' ,
@@ -272,5 +272,2479 @@
</testcase>
</function>
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_003 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_003
+ #@TestPurpose Delete the collective attribute
+ #@TestPreamble
+ #@TestSteps Delete the collective attribute secretary
+ #@TestSteps Verify in one entry the attribute has been removed.
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_003" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_003: Delete the Collective Attribute ')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kwinters,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=abergin,ou=Europe,%s' % baseDN
+ </script>
+
+ <message>'++ Delete collective attribute secretary, should pass'</message>
+ <call function="'ldapDeleteWithScript'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsDeleteSubtree' : 'TRUE' ,
+ 'dsDn' : ['cn=Collective Secretary,dc=example,dc=com']
+ }
+ </call>
+
+
+ <message>'++ Search attribute secretary in user kwinters, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'secretary'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'secretary: ',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user kwinters, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective Secretary,',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+ <message>'++ Search attribute secretary in user abergin, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'secretary'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'secretary:',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_004 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_004
+ #@TestPurpose add an attribute of collective type
+ #@TestPreamble
+ #@TestSteps add attribute of collective type c-PostalAddress
+ #@TestSteps verify in 2 entries that attribute has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_004" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_004: Add an attribute of collective type')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif4='%s/core/ldifs/collectiveattr-4.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=jwallace,ou=South,ou=America,%s' % baseDN
+ targetDN2='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add an attribute of collective type c-PostalAddress, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif4
+ }
+ </call>
+
+ <message>'++ Search attribute c-PostalAddress in user jwallace'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Example Com\$01251 Chestnut Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user jwallace '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PostalAddress,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PostalAddress in user scarter'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-PostalAddress=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Example Com\$01251 Chestnut Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_005 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_005
+ #@TestPurpose modify the value of an attribute of collective type
+ #@TestPreamble
+ #@TestSteps modify the value of the attribute c-PostalAddress
+ #@TestSteps verify in 2 entries that attribute has been modified
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_005" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_005: Modify an attribute of collective type')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif5='%s/core/ldifs/collectiveattr-5.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=gfarmer,ou=America,%s' % baseDN
+ targetDN2='uid=tmorris,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Modify the value of the attribute c-PostalAddress, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif5
+ }
+ </call>
+
+ <message>'++ Search attribute c-PostalAddress in user gfarmer'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Collective Attr\$76600 Williams Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user tmorris '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PostalAddress,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PostalAddress in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Collective Attr\$76600 Williams Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+<!--- Test Case : Core : Collective Attributes : core_collectiveattr_006 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_006
+ #@TestPurpose Delete an attribute of collective type
+ #@TestPreamble
+ #@TestSteps delete the attribute c-PostalAddress
+ #@TestSteps verify in 2 entries that attribute has been removed
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_006" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_006: delete an attribute of collective type')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kvaughan,ou=Europe,%s' % baseDN
+ targetDN2='uid=dmiller,ou=America,%s' % baseDN
+ </script>
+
+ <message>'++ Delete the attribute c-PostalAddress, should pass'</message>
+ <call function="'ldapDeleteWithScript'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsDeleteSubtree' : 'TRUE' ,
+ 'dsDn' : ['cn=Collective c-PostalAddress,dc=example,dc=com']
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PostalAddress in user kvaughan, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'secretary=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'secretary: ',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user kvaughan, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective PostalAddress,',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+ <message>'++ Search attribute c-PostalAddress in user dmiller, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-PostalAddress=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress:',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_007 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_007
+ #@TestPurpose add a collective attribute and an attribute of collective type
+ #@TestPreamble
+ #@TestSteps add 2 collective attributes with the 2 syntaxes
+ #@TestSteps verify in 2 entries that 2 attributes have been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_007" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_007: Add 2 collective attributes with the 2 syntaxes')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif7='%s/core/ldifs/collectiveattr-7.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add 2 collective attributes secretary and c-TelexNumber, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif7
+ }
+ </call>
+
+ <message>'++ Search 2 attributes in user trigden'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-TelexNumber: 959\$105\$TYR',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'secretary: uid=tmorris,ou=Asia,ou=People',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user trigden '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-TelexNumber',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective Secretary',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search the 2 attribute in user scarter'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'c-TelexNumber secretary'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'secretary: uid=tmorris,ou=Asia,ou=People',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-TelexNumber: 959\$105\$TYR',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_008 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_008
+ #@TestPurpose Add a collective attribute to test minimumDepth syntax 1
+ #@TestPreamble
+ #@TestSteps add collective attribute to test minimumDepth
+ #@TestSteps (with businesscategory) verify in 1 entry under ou=North
+ #@TestSteps that attribute has been added, in 1 entry under ou=South
+ #@TestSteps and in 1 entry outside ou=North that attribute has not
+ #@TestSteps been added.
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_008" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_008: Add a collective attribute to test minimumDepth syntax 1')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif8='%s/core/ldifs/collectiveattr-8.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=cschmith,ou=South,ou=America,%s' % baseDN
+ targetDN3='uid=abergin,ou=Europe,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute businesscategory, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif8
+ }
+ </call>
+
+ <message>'++ Search attribute businesscategory in user trigden'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'businesscategory=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'businessCategory: Finance Group',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user trigden'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective businessCategory,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute businesscategory in user cschmith'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'businesscategory=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'businessCategory: Finance Group',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute businesscategory in user abergin should FAIL'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'businesscategory=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'businessCategory: Finance Group',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+<!--- Test Case : Core : Collective Attributes : core_collectiveattr_009 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_009
+ #@TestPurpose Add a collective attribute to test minimumDepth syntax 2
+ #@TestPreamble
+ #@TestSteps add collective attribute to test minimumDepth
+ #@TestSteps (with c-ou) verify in 1 entry under ou=North
+ #@TestSteps that attribute has been added, in 1 entry under ou=South
+ #@TestSteps and in 1 entry outside ou=North that attribute has not
+ #@TestSteps been added.
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_009" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_009: Add a collective attribute to test minimumDepth syntax2')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif9='%s/core/ldifs/collectiveattr-9.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kwinters,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=jwallace,ou=South,ou=America,%s' % baseDN
+ targetDN3='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute c-ou should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif9
+ }
+ </call>
+
+ <message>'++ Search attribute c-ou in user kwinters'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'c-ou=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-ou: corporate',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user kwinters'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-ou,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-ou in user jwallace'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-ou=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-ou: corporate',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute c-ou in user scarter should FAIL'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'c-ou=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-ou: corporate',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_010 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_010
+ #@TestPurpose Remove one subtree to test minimumDepth
+ #@TestPreamble
+ #@TestSteps remove one subtree ou=South to test minimumDepth
+ #@TestSteps (with businesscategory) verify in 1 entry under ou=North
+ #@TestSteps that attribute is still there , in 1 entry
+ #@TestSteps under ou=South the entry isn't there anymore, and in
+ #@TestSteps 1 entry outside ou=America it's not been added.
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_010" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_010: Remove one subtree to test minimumDepth')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kwinters,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=jwallace,ou=South,ou=America,%s' % baseDN
+ targetDN3='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Delete the subtree ou=South,ou=America'</message>
+ <call function="'ldapDeleteWithScript'">
+ {
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsDeleteSubtree' : 'TRUE' ,
+ 'dsDn' : ['ou=South,ou=America,%s' % baseDN]
+ }
+ </call>
+
+ <message>'++ Search attributes c-ou and businessCategory in user kwinters, should Pass'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-ou: corporate',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'businessCategory: Finance Group',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attributes collectiveAttributeSubentries in user kwinters'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-ou',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective businessCategory',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-ou in user jwallace, should Fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-ou=*' ,
+ 'expectedRC' : 32
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+ <message>'++ Search attribute businessCategory=* in user jwallace, should Fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'businessCategory=*' ,
+ 'expectedRC' : 32
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+
+
+ <message>'++ Search attributes c-ou and businessCategory in user scarter should FAIL'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-ou: corporate',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'businessCategory: Finance Group',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_011 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_011
+ #@TestPurpose Add a collective attribute to test minimumDepth maximumDepth syntax1
+ #@TestPreamble
+ #@TestSteps add collective attribute to test minimumDepth
+ #@TestSteps maximumDepth syntax1 (with departmentNumber) verify
+ #@TestSteps under ou=North that attribute has not been added, and
+ #@TestSteps in under ou=Europe that attribute has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_011" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_011: Add a collective attribute to test minimumDepth maximumDepth syntax1')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif11='%s/core/ldifs/collectiveattr-11.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=abergin,ou=Europe,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute departmentNumber should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif11
+ }
+ </call>
+
+ <message>'++ Search attribute departmentNumber in user trigden, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'departmentNumber=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'departmentNumber: 445566',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user abergin'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective departmentNumber,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute departmentNumber in user abergin'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'departmentNumber=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'departmentNumber: 445566',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_012 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_012
+ #@TestPurpose Add a collective attribute to test minimumDepth maximumDepth syntax2
+ #@TestPreamble
+ #@TestSteps add collective attribute to test minimumDepth
+ #@TestSteps maximumDepth syntax2 (with c-PostOfficeBox) verify
+ #@TestSteps under ou=North that attribute has not been added, and
+ #@TestSteps in under ou=Asia that attribute has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_012" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_012: Add a collective attribute to test minimumDepth maximumDepth syntax2')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif12='%s/core/ldifs/collectiveattr-12.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kwinters,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=tmorris,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute c-PostOfficeBox should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif12
+ }
+ </call>
+
+ <message>'++ Search attribute c-PostOfficeBox in user kwinters, should fail'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'c-PostOfficeBox=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostOfficeBox: PO BOX 2869',
+ 'returnString' : returnString ,
+ 'expectedRC' : 1 ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PostOfficeBox,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PostOfficeBox in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-PostOfficeBox=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostOfficeBox: PO BOX 2869',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_014 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_014
+ #@TestPurpose Create a custom attribute then make it collective
+ #@TestPreamble
+ #@TestSteps add a custom attribute commonSecretary the create a
+ #@TestSteps collective attribute with that new attribute. verify in
+ #@TestSteps 1 entry that attribute has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_014" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_014: Create a custom Attribute then make it collective')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif14a='%s/core/ldifs/collectiveattr-14a.ldif' % remote.data
+ coreattrLdif14b='%s/core/ldifs/collectiveattr-14b.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=dmiller,ou=America,%s' % baseDN
+ targetDN2='uid=abergin,ou=Europe,%s' % baseDN
+ </script>
+
+ <message>'++ Add custom attribute commonSecretary, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif14a
+ }
+ </call>
+
+ <message>'++ Add collective attribute for commonSecretary, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif14b
+ }
+ </call>
+
+
+ <message>'++ Search attribute commonSecretary in user dmiller'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'commonSecretary'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'commonSecretary: uid=gfarmer,ou=America,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user dmiller'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective commonSecretary,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute commonSecretary in user abergin'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'commonSecretary'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'commonSecretary: uid=gfarmer,ou=America',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+<!--- Test Case : Core : Collective Attributes : core_collectiveattr_015 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_015
+ #@TestPurpose add PostallAddress collective attribute and
+ #@TestPurpose c-PostalAddress attribute of collective type
+ #@TestPreamble
+ #@TestSteps add 2 collective attributes with the 2 syntaxes
+ #@TestSteps PostalAddress and c-PostalAddress
+ #@TestSteps verify in 2 entries that 2 attributes have been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_015" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_015: Add PostalAddress and c-PostalAddress collective attributes with the 2 syntaxes')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif15='%s/core/ldifs/collectiveattr-15.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add 2 collective attributes PostalAddress and c-PostalAddress, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif15
+ }
+ </call>
+
+ <message>'++ Search 2 attributes in user trigden'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'postalAddress: Example Com\$ 40388 Sixth Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Example Com\$30754 College Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user trigden '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective PostalAddress',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PostalAddress',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search the 2 attributes in user scarter'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'PostalAddress c-PostalAddress'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'PostalAddress: Example Com\$ 40388 Sixth Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalAddress: Example Com\$30754 College Street.*',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_016 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_016
+ #@TestPurpose Add a collective attribute to test real-overides-virtual
+ #@TestPreamble
+ #@TestSteps add collective attribute to test real-overides-virtual
+ #@TestSteps syntax1 (with facsimileTelephoneNumber) verify
+ #@TestSteps under ou=Europe that attribute has been added, and
+ #@TestSteps outside ou=Europe that attribute has not been modified
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_016" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_016: Add a collective attribute to test real-overides-virtual syntax1')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif16a='%s/core/ldifs/collectiveattr-16a.ldif' % remote.data
+ coreattrLdif16b='%s/core/ldifs/collectiveattr-16b.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=kvaughan,ou=Europe,%s' % baseDN
+ targetDN3='uid=rdaugherty,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute facsimileTelephoneNumber should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif16a
+ }
+ </call>
+
+ <message>'++ Search attribute facsimileTelephoneNumber in user trigden, should pass with real value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'facsimileTelephoneNumber=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'facsimileTelephoneNumber: \+1 408 555 8473',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user kvaughan'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective facsimileTelephoneNumber,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute facsimileTelephoneNumber in user kvaughan'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'facsimileTelephoneNumber=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'facsimileTelephoneNumber: \+1 408 555 8477',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Add new user rdaugherty with a set facsimileTelephoneNumber should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif16b
+ }
+ </call>
+
+ <message>'++ Search attribute facsimileTelephoneNumber in user rdaugherty'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'facsimileTelephoneNumber=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'facsimileTelephoneNumber: \+1 408 555 1992',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_017 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_017
+ #@TestPurpose Add a collective attribute to test real-overides-virtual
+ #@TestPreamble
+ #@TestSteps add collective attribute to test real-overides-virtual
+ #@TestSteps syntax2 (with c-PhysicalDeliveryOfficeName) verify in
+ #@TestSteps 2 entries that the virtual value has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_017" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_017: Add a collective attribute to test real-overides-virtual syntax2')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif17='%s/core/ldifs/collectiveattr-17.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=trigden,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=tmorris,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute c-PhysicalDeliveryOfficeName should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif17
+ }
+ </call>
+
+ <message>'++ Search attribute c-PhysicalDeliveryOfficeName in user trigden, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'c-PhysicalDeliveryOfficeName=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PhysicalDeliveryOfficeName: par07',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PhysicalDeliveryOfficeName,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PhysicalDeliveryOfficeName in user tmorris, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-PhysicalDeliveryOfficeName=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PhysicalDeliveryOfficeName: par07',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_018 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_018
+ #@TestPurpose Add a collective attribute to test virtual-overides-real
+ #@TestPreamble
+ #@TestSteps add collective attribute to test virtual-overides-real
+ #@TestSteps syntax1 (with employeeType) verify when in an entry
+ #@TestSteps that the virtual value has overridden the real one, in
+ #@TestSteps another one that attribute has been added, then add a
+ #@TestSteps user that has a set value for employeeType and verify
+ #@TestSteps by adding the user that employeeType will change.
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_018" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_018: Add a collective attribute to test virtual-overides-real syntax1')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif18a='%s/core/ldifs/collectiveattr-18a.ldif' % remote.data
+ coreattrLdif18b='%s/core/ldifs/collectiveattr-18b.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=dmiller,ou=America,%s' % baseDN
+ targetDN2='uid=tmorris,ou=Asia,%s' % baseDN
+ targetDN3='uid=jreuter,ou=Europe,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute employeeType should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif18a
+ }
+ </call>
+
+ <message>'++ Search attribute employeeType in user dmiller, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'employeeType=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'employeeType: LTR-3',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective employeeType,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute employeeType in user tmorris, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'employeeType: LTR-3',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Add new user jreuter with a set employeeType should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif18b
+ }
+ </call>
+
+ <message>'++ Search attribute employeeType in user jreuter, should pass with virtual value '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'employeeType: LTR-3',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+<!--- Test Case : Core : Collective Attributes : core_collectiveattr_019 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_019
+ #@TestPurpose Add a collective attribute to test virtual-overides-real
+ #@TestPreamble
+ #@TestSteps add collective attribute and set virtual-overides-real
+ #@TestSteps syntax2 (with c-PostalCode) verify in 2 entries
+ #@TestSteps that the virtual value has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_019" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_019: Add a collective attribute to test virtual-overides-real syntax2')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif19='%s/core/ldifs/collectiveattr-19.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=kwinters,ou=North,ou=America,%s' % baseDN
+ targetDN2='uid=scarter,ou=Asia,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute c-PostalCode should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif19
+ }
+ </call>
+
+ <message>'++ Search attribute c-PostalCode in user kwinters, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'c-PostalCode=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalCode: 76800',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user scarter'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-PostalCode,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute c-PostalCode in user scarter, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'c-PostalCode=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-PostalCode: 76800',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_020 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_020
+ #@TestPurpose Add a collective attribute to test merge-real-and-virtual
+ #@TestPreamble
+ #@TestSteps add collective attribute to test merge-real-and-virtual
+ #@TestSteps syntax1 (with preferredLanguage) verify in 1 entry
+ #@TestSteps the attribute value is the virtual and the real one, in
+ #@TestSteps another one that attribute has been added, then add a
+ #@TestSteps user that has a set value for preferredServerList and
+ #@TestSteps verify by adding the user that preferredServerList will
+ #@TestSteps have both values
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_020" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_020: Add a collective attribute to test merge-real-and-virtual syntax1')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif20a='%s/core/ldifs/collectiveattr-20a.ldif' % remote.data
+ coreattrLdif20b='%s/core/ldifs/collectiveattr-20b.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=dmiller,ou=America,%s' % baseDN
+ targetDN2='uid=tmorris,ou=Asia,%s' % baseDN
+ targetDN3='uid=tmason,ou=America,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute preferredLanguage should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif20a
+ }
+ </call>
+
+ <message>'++ Search attribute preferredLanguage in user dmiller, should pass with both values'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'preferredLanguage=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'preferredLanguage: fr',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'preferredLanguage: zh_CN',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user tmorris'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective preferredLanguage,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Search attribute preferredLanguage in user tmorris, should pass with virtual value'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN2 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'preferredLanguage: zh_CN',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Add new user tmason with a set preferredLanguage should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif20b
+ }
+ </call>
+
+ <message>'++ Search attribute preferredLanguage in user tmason should pass with both values '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'preferredLanguage: ja_JP',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'preferredLanguage: zh_CN',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
+
+
+ <!--- Test Case : Core : Collective Attributes : core_collectiveattr_021 -->
+ <!--- Test Case information
+ #@TestMarker Schema
+ #@TestName Core : Collective Attributes
+ #@TestID core_collectiveattr_021
+ #@TestPurpose Add a collective attribute to test merge-real-and-virtual
+ #@TestPreamble
+ #@TestSteps add collective attribute to test merge-real-and-virtual
+ #@TestSteps syntax2 (with c-l) verify in 1 entry the attribute value
+ #@TestSteps is the virtual one, add a user, verify the attribute
+ #@TestSteps c-l has been added
+ #@TestPostamble
+ #@TestResult Test is successful if the result code is 0
+ -->
+ <function name="core_collectiveattr_021" scope="local">
+ <testcase name="getTestCaseName('core_collectiveattr_021: Add a collective attribute to test merge-real-and-virtual syntax2')">
+ <sequence>
+ <try>
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Test Name = %s' % STAXCurrentTestcase
+ </message>
+
+ <script>
+ coreattrLdif21a='%s/core/ldifs/collectiveattr-21a.ldif' % remote.data
+ coreattrLdif21b='%s/core/ldifs/collectiveattr-21b.ldif' % remote.data
+ baseDN='ou=People,o=collectiveattr tests,dc=example,dc=com'
+ targetDN1='uid=gfarmer,ou=America,%s' % baseDN
+ targetDN3='uid=bhall,ou=North,ou=America,%s' % baseDN
+ </script>
+
+ <message>'++ Add collective attribute c-l should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif21a
+ }
+ </call>
+
+ <message>'++ Search attribute c-l and l in user gfarmer, should pass'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'c-l=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-l: Santa Clara',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'l: Cupertino',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+ <message>'++ Search attribute collectiveAttributeSubentries in user gfarmer'</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN1 ,
+ 'dsFilter' : 'objectclass=*' ,
+ 'dsAttributes' : 'collectiveAttributeSubentries'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'collectiveAttributeSubentries: cn=Collective c-l,',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ <message>'++ Add new user bhall, should pass'</message>
+ <call function="'ldapModifyWithScript'">
+ {
+ 'dsAdd' : 'True' ,
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsFilename' : coreattrLdif21b
+ }
+ </call>
+
+ <message>'++ Search attribute c-l and l in user bhall should pass '</message>
+ <call function="'ldapSearchWithScript'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'dsBaseDN' : targetDN3 ,
+ 'dsFilter' : 'objectclass=*'
+ }
+ </call>
+ <script>
+ returnString = STAXResult[0][1]
+ </script>
+ <call function="'searchString'">
+ { 'expectedString' : 'c-l: Santa Clara',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+ <call function="'searchString'">
+ { 'expectedString' : 'l: Sunnyvale',
+ 'returnString' : returnString ,
+ 'expectedRC' : expectedRC ,
+ }
+ </call>
+
+
+ </sequence>
+
+ <catch exception="'STAXException.*'" typevar="eType" var="eInfo">
+ <message log="1" level="'fatal'">
+ '%s: Test failed. eInfo(%s)' % (eType,eInfo)
+ </message>
+ </catch>
+
+ <finally>
+ <call function="'testCase_Postamble'"/>
+ </finally>
+ </try>
+ </sequence>
+ </testcase>
+ </function>
</stax>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
index 9eb445f..b8cd51b 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsml/dsml_setup.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Portions Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Portions Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="dsml_setup" />
@@ -53,23 +53,38 @@
}
</call>
- <call function="'unZipFile'">
- {
- 'location' : STAXServiceMachine,
- 'zipfile' : '%s/%s' % (ZIPPATH, ZIPNAME),
- 'file' : '%s/lib/OpenDS.jar' % OPENDSNAME,
- 'unzipdir' : '%s/dsml' % TMPDIR
- }
- </call>
+ <!--- In IPS mode, get snmp-mib2605.jar from remote machine-->
+ <if expr="IPS_PKG == True">
+ <call function="'copyFile'">
+ {
+ 'location' : STAF_REMOTE_HOSTNAME,
+ 'srcfile' : '%s/%s/lib/OpenDS.jar' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME),
+ 'destfile' : '%s/dsml/STAF-INF/jars/OpenDS.jar' % TMPDIR,
+ 'remotehost' : STAXServiceMachine
+ }
+ </call>
+ <else>
+ <sequence>
+ <call function="'unZipFile'">
+ {
+ 'location' : STAXServiceMachine,
+ 'zipfile' : '%s/%s' % (ZIPPATH, ZIPNAME),
+ 'file' : '%s/lib/OpenDS.jar' % OPENDSNAME,
+ 'unzipdir' : '%s/dsml' % TMPDIR
+ }
+ </call>
- <call function="'copyFile'">
- {
- 'location' : STAXServiceMachine,
- 'srcfile' : '%s/dsml/%s/lib/OpenDS.jar' % (TMPDIR,OPENDSNAME),
- 'destfile' : '%s/dsml/STAF-INF/jars/OpenDS.jar' % TMPDIR,
- 'remotehost' : STAXServiceMachine
- }
- </call>
+ <call function="'copyFile'">
+ {
+ 'location' : STAXServiceMachine,
+ 'srcfile' : '%s/dsml/%s/lib/OpenDS.jar' % (TMPDIR,OPENDSNAME),
+ 'destfile' : '%s/dsml/STAF-INF/jars/OpenDS.jar' % TMPDIR,
+ 'remotehost' : STAXServiceMachine
+ }
+ </call>
+ </sequence>
+ </else>
+ </if>
<call function="'unZipFile'">
{
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
index 5237c4e..06facb8 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/basic/basic.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -110,8 +110,7 @@
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
-
-
+
<!--- Test Case information
#@TestMarker Replication Basic Tests
@@ -314,8 +313,6 @@
-
-
<!--- Test Case information
#@TestMarker Replication Basic Tests
#@TestName Replication: Basic: Modify Entry - add single
@@ -639,8 +636,7 @@
</sequence>
</testcase>
-
-
+
<!--- Test Case information
#@TestMarker Replication Basic Tests
@@ -1971,13 +1967,93 @@
+ <!--- Test Case information
+ #@TestMarker Replication Basic Tests
+ #@TestName Replication: Basic: Add entry after restart
+ #@TestID Add entry after restart
+ #@TestPurpose Check entry add over secured replication after
+ server restart
+ #@TestPreamble
+ #@TestSteps Restart servers
+ #@TestSteps Add entry
+ #@TestPostamble
+ #@TestResult Success if trees synchronised over the topology
+ -->
+ <testcase name="getTestCaseName('Add entry after restart')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Replication: Basic: Add entry after restart. \
+ Check entry add over secured replication after server restart'
+ </message>
+
+ <!-- Stop the servers in the topology -->
+ <call function="'stopServers'">
+ [_splitServerList]
+ </call>
+
+ <!-- Start the servers in the topology -->
+ <call function="'startServers'">
+ [_splitServerList]
+ </call>
+
+ <iterate var="server" in="_topologyServerList" indexvar="i">
+ <sequence>
+ <script>
+ serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
+ userDn = 'uid=RESTART-iabizen-%s, %s' % \
+ (i,synchroSuffix)
+ </script>
+
+ <!-- Add entry to one of the other servers -->
+ <script>
+ listAttr = []
+ listAttr.append('objectclass:top')
+ listAttr.append('objectclass:organizationalperson')
+ listAttr.append('objectclass:inetorgperson')
+ listAttr.append('objectclass:person')
+ listAttr.append('givenname:Izen-%s' % i)
+ listAttr.append('sn:Abizen-%s' % i)
+ listAttr.append('cn:Izen-%s Abizen-%s' % (i, i))
+ listAttr.append('l:ICNC')
+ </script>
+
+ <call function="'addAnEntry'">
+ { 'location' : server.getHostname(),
+ 'dsPath' : serverPath,
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstancePort' : server.getPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'DNToAdd' : userDn,
+ 'listAttributes' : listAttr
+ }
+ </call>
+
+ </sequence>
+ </iterate>
+
+ <!-- Verify the synchronization of the trees among the servers in
+ the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue CR 6925675: Removing suffix root entry brings
+ ! generation ID loss
+ -->
+ <call function="'verifyTrees'">
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '6925675' ]
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/replication_cleanup.xml'
% (TESTS_DIR)"/>
<call function="'replication_cleanup'" />
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
index fe1f84c..d1f0a95 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/encryption/encryption.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -97,16 +97,6 @@
<script>
serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
userDn = 'uid=iabizen-%s, ou=People, %s' % (i,synchroSuffix)
-
- if i == 0:
- myKnownIssue = None
- else:
- # if we fail to add the entry to the 'consumer' servers
- # => it may mean that the initialize-all is not completely
- # done yet, and so we may have come across Issue 3315
- # (dsreplication initialize-all returns before peer
- # has completed initialisation)
- myKnownIssue = '3315'
</script>
<!-- Add entry to one of the other servers -->
@@ -130,9 +120,7 @@
'dsInstanceDn' : server.getRootDn(),
'dsInstancePswd' : server.getRootPwd(),
'DNToAdd' : userDn,
- 'listAttributes' : listAttr,
- 'expectedRC' : 0,
- 'knownIssue' : myKnownIssue
+ 'listAttributes' : listAttr
}
</call>
@@ -148,7 +136,89 @@
<call function="'testCase_Postamble'"/>
</sequence>
- </testcase>
+ </testcase>
+
+
+ <!--- Test Case information
+ #@TestMarker Replication Encryption Tests
+ #@TestName Replication: Encryption: Add entry after restart
+ #@TestID Add entry after restart
+ #@TestPurpose Check entry add over secured replication after
+ server restart
+ #@TestPreamble
+ #@TestSteps Restart servers
+ #@TestSteps Add entry
+ #@TestPostamble
+ #@TestResult Success if trees synchronised over the topology
+ -->
+ <testcase name="getTestCaseName('Add entry after restart')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+ <message>
+ 'Replication: Encryption: Add entry after restart. \
+ Check entry add over secured replication after server restart'
+ </message>
+
+ <!-- Stop the servers in the topology -->
+ <call function="'stopServers'">
+ [_splitServerList]
+ </call>
+
+ <!-- Start the servers in the topology -->
+ <call function="'startServers'">
+ [_splitServerList]
+ </call>
+
+ <iterate var="server" in="_topologyServerList" indexvar="i">
+ <sequence>
+ <script>
+ serverPath = '%s/%s' % (server.getDir(), OPENDSNAME)
+ userDn = 'uid=RESTART-iabizen-%s, ou=People, %s' % \
+ (i,synchroSuffix)
+ </script>
+
+ <!-- Add entry to one of the other servers -->
+ <script>
+ listAttr = []
+ listAttr.append('objectclass:top')
+ listAttr.append('objectclass:organizationalperson')
+ listAttr.append('objectclass:inetorgperson')
+ listAttr.append('objectclass:person')
+ listAttr.append('givenname:Izen-%s' % i)
+ listAttr.append('sn:Abizen-%s' % i)
+ listAttr.append('cn:Izen-%s Abizen-%s' % (i, i))
+ listAttr.append('l:ICNC')
+ </script>
+
+ <call function="'addAnEntry'">
+ { 'location' : server.getHostname(),
+ 'dsPath' : serverPath,
+ 'dsInstanceHost' : server.getHostname(),
+ 'dsInstancePort' : server.getPort(),
+ 'dsInstanceDn' : server.getRootDn(),
+ 'dsInstancePswd' : server.getRootPwd(),
+ 'DNToAdd' : userDn,
+ 'listAttributes' : listAttr
+ }
+ </call>
+
+ </sequence>
+ </iterate>
+
+ <!-- Verify the synchronization of the trees among the servers in
+ the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
+ <call function="'verifyTrees'">
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
@@ -207,9 +277,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -269,8 +344,13 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
</call>
@@ -367,9 +447,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -467,9 +552,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -565,9 +655,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -666,9 +761,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -781,9 +881,14 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
@@ -883,22 +988,27 @@
<!-- Verify the synchronization of the trees among the servers in
the topology -->
+ <!-- If tree verification fails, we may have come across known
+ ! issue #4534: Replication using security does not work after
+ ! server restart
+ -->
<call function="'verifyTrees'">
- [ clientHost, clientPath, master, consumerList, synchroSuffix ]
- </call>
+ [ clientHost, clientPath, master, consumerList, synchroSuffix,
+ '4534' ]
+ </call>
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
-
-
+
+
<import machine="STAF_LOCAL_HOSTNAME"
file="'%s/testcases/replication/replication_cleanup.xml'
% (TESTS_DIR)"/>
<call function="'replication_cleanup'" />
-
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
index 118d43c..f4e0ff3 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/account_activation/security_account_expiration.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Copyright 2006-2010 Sun Microsystems, Inc.
! -->
<stax>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
index 167fef4..e675079 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/security/client_auth/fingerprint_mapper.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2008 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
index 281e9c5..e9b3096 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_mibvalues.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -187,9 +187,15 @@
<script>
jobInfo=eval(STAFResult)
- if jobInfo.has_key('%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)):
- serverInformation=jobInfo['%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)]
+ # In IPS mode, DIRECTORY_INSTANCE_BIN is used
+ # for installation path
+ if IPS_PKG == True:
+ instPath = DIRECTORY_INSTANCE_BIN
+ else:
+ instPath = DIRECTORY_INSTANCE_DIR
+ if jobInfo.has_key('%s/%s' % (instPath,OPENDSNAME)):
+ serverInformation=jobInfo['%s/%s' % (instPath,OPENDSNAME)]
dsVersion=serverInformation['server version']
dsBuild=serverInformation['server buildid']
else:
@@ -259,7 +265,7 @@
<script>
dsServerDescription = DEFAULT_VALUES['dsServerDescription.1']
- dsPath = '%s/%s' % (DIRECTORY_INSTANCE_DIR, OPENDSNAME)
+ dsPath = '%s/%s' % (DIRECTORY_INSTANCE_BIN, OPENDSNAME)
if is_windows_platform(DIRECTORY_INSTANCE_HOST):
dsPath = dsPath.replace('/', '\\')
</script>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
index 8685090..2b0c084 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/snmp/snmp_status.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -698,9 +698,9 @@
<call function="'testCase_Preamble'"/>
- <!-- This testcase is not relevant on Windows -->
+ <!-- This testcase is not relevant on Windows and in IPS mode -->
<script>
- if is_windows_platform(STAF_REMOTE_HOSTNAME):
+ if is_windows_platform(STAF_REMOTE_HOSTNAME) or IPS_PKG:
skip=1
else:
skip=0
diff --git a/opends/tests/staf-tests/shared/ant/build.properties b/opends/tests/staf-tests/shared/ant/build.properties
index 56a1f93..e68cff6 100644
--- a/opends/tests/staf-tests/shared/ant/build.properties
+++ b/opends/tests/staf-tests/shared/ant/build.properties
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007-2009 Sun Microsystems, Inc.
+# Copyright 2007-2010 Sun Microsystems, Inc.
######
@@ -94,12 +94,14 @@
# Tests section
tests.default=true
-tests.tmp.dir=${logs.dir}/${tests.type}/tmp
+tests.tmp.dir=${basedir}/temp/instance
tests.dir=${basedir}/${tests.type}
tests.shared.dir=${shared.dir}/tests
tests.config.stubs=${tests.shared.dir}/config.py.stubs
tests.topology.dir=${shared.dir}/topology
tests.xml=${tests.shared.dir}/runTestJob.xml
+instance.bin=${tests.tmp.dir}
+instance.dir=${tests.tmp.dir}
opends.port.ldap=1389
opends.port.admin=4444
opends.port.ldaps=1636
@@ -117,5 +119,6 @@
logs.uri=file://
tests.os.string=${os.name}
tests.jvm.string=${java.version}(${sun.arch.data.model} bits)
+original.archive=${default.opends.dir}/${default.opends.name}.zip
replication.split=
replication.eclmode=
diff --git a/opends/tests/staf-tests/shared/ant/build.xml b/opends/tests/staf-tests/shared/ant/build.xml
index 6e55eac..9d68649 100644
--- a/opends/tests/staf-tests/shared/ant/build.xml
+++ b/opends/tests/staf-tests/shared/ant/build.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<project name="opends-staf-tests" basedir="../.." default="usage">
@@ -226,7 +226,7 @@
<var name="staf.executable" value="${staf.bin.dir}/STAF${extension.binary}"/>
<var name="archives.dir" value="${repository.dir}/archives"/>
- <var name="tests.run.dir" value="${logs.dir}/${tests.type}/run"/>
+ <var name="tests.run.dir" value="${logs.dir}"/>
<if>
<equals arg1="${os.family}" arg2="windows"/>
diff --git a/opends/tests/staf-tests/shared/ant/opends.xml b/opends/tests/staf-tests/shared/ant/opends.xml
index 2416f63..5251577 100644
--- a/opends/tests/staf-tests/shared/ant/opends.xml
+++ b/opends/tests/staf-tests/shared/ant/opends.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<project name="opends">
diff --git a/opends/tests/staf-tests/shared/ant/tests.xml b/opends/tests/staf-tests/shared/ant/tests.xml
index 3a82c78..a663dbf 100644
--- a/opends/tests/staf-tests/shared/ant/tests.xml
+++ b/opends/tests/staf-tests/shared/ant/tests.xml
@@ -22,7 +22,7 @@
! CDDL HEADER END
!
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<project name="tests">
@@ -52,8 +52,9 @@
<target name="run">
<tstamp>
- <format property="tests.run.time" pattern="yyyy.MM.dd-HH.mm.ss"/>
+ <format property="tests.timestamp" pattern="yyyyMMdd-HHmmss"/>
</tstamp>
+ <var name="tests.run.time" value="${remote.hostname}-${tests.timestamp}"/>
<!-- clean up tmp dir -->
<if>
@@ -69,11 +70,20 @@
<mkdir dir="${tests.run.dir}/${tests.run.time}/config"/>
<!-- these will serve for after-the-fact archiving the logs -->
<mkdir dir="${tests.run.dir}/${tests.run.time}/staf-logs"/>
+ <mkdir dir="${tests.run.dir}/${tests.run.time}/logs"/>
<if>
<equals arg1="${test.plan.custom}" arg2=""/>
<then>
- <var name="test.plan.custom" value="${test.plan.default}"/>
+ <if>
+ <equals arg1="${tests.type}" arg2="functional-tests"/>
+ <then>
+ <var name="test.plan.custom" value="${test.plan.functional.default}"/>
+ </then>
+ <else>
+ <var name="test.plan.custom" value="${test.plan.stress.default}"/>
+ </else>
+ </if>
</then>
</if>
@@ -210,13 +220,13 @@
<equals arg1="${tests.mode.input}" arg2="remote" />
<then>
<input message=" Enter directory instance directory (on remote machine):"
- defaultvalue="${tests.tmp.dir}"
- addproperty="tests.tmp.dir.input"/>
+ defaultvalue="${instance.dir}"
+ addproperty="instance.dir.input"/>
</then>
<else>
<input message=" Enter directory instance directory:"
- defaultvalue="${tests.tmp.dir}"
- addproperty="tests.tmp.dir.input"/>
+ defaultvalue="${instance.dir}"
+ addproperty="instance.dir.input"/>
</else>
</if>
@@ -358,8 +368,10 @@
logs.dir=${logs.dir.input}
opends.dir=${opends.dir.input}
opends.name=${opends.name.input}
-tests.tmp.dir=${tests.tmp.dir.input}
+tests.tmp.dir=${instance.dir.input}
tests.default=${tests.default.input}
+instance.bin=${instance.dir.input}
+instance.dir=${instance.dir.input}
opends.port.ldap=${opends.port.ldap.input}
opends.port.admin=${opends.port.admin.input}
opends.port.ldaps=${opends.port.ldaps.input}
@@ -369,7 +381,8 @@
ldclt.dir=${ldclt.dir.input}
verbose.mode=${verbose.mode.input}
wc.type=tomcat
-test.plan.custom=${test.plan.custom}</echo>
+test.plan.custom=${test.plan.custom}
+original.archive=${opends.dir.input}/${opends.name.input}.zip</echo>
</target>
diff --git a/opends/tests/staf-tests/shared/functions/dsadm.xml b/opends/tests/staf-tests/shared/functions/dsadm.xml
index 900a366..777587b 100755
--- a/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -610,13 +610,24 @@
<if expr="expectedRC == 0 or expectedRC == 'noCheck'">
<!--- Check that DS stopped -->
- <call function="'isStopped'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'noOfLoops' : noOfLoops,
- 'noOfMilliSeconds' : noOfMilliSeconds
- }
- </call>
+ <if expr="IPS_PKG == True">
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : 6000
+ }
+ </call>
+ <else>
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ </else>
+ </if>
</if>
</sequence>
</function>
@@ -2614,13 +2625,24 @@
<if expr="expectedRC == 0">
<!--- Check that DS stopped -->
- <call function="'isStopped'">
- { 'location' : location,
- 'dsPath' : dsPath,
- 'noOfLoops' : noOfLoops,
- 'noOfMilliSeconds' : noOfMilliSeconds
- }
- </call>
+ <if expr="IPS_PKG == True">
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : '%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME),
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ <else>
+ <call function="'isStopped'">
+ { 'location' : location,
+ 'dsPath' : dsPath,
+ 'noOfLoops' : noOfLoops,
+ 'noOfMilliSeconds' : noOfMilliSeconds
+ }
+ </call>
+ </else>
+ </if>
</if>
<return>STAFCmdRC</return>
@@ -4023,7 +4045,8 @@
'command' : STAFCmd,
'arguments' : STAFCmdParams,
'location' : location,
- 'expectedRC' : expectedRC
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
}
</call>
@@ -4165,7 +4188,7 @@
'arguments' : STAFCmdParams,
'location' : location,
'expectedRC' : expectedRC,
- 'knownIssue': knownIssue
+ 'knownIssue' : knownIssue
}
</call>
diff --git a/opends/tests/staf-tests/shared/functions/environment.xml b/opends/tests/staf-tests/shared/functions/environment.xml
index 71b860f..29d5b62 100755
--- a/opends/tests/staf-tests/shared/functions/environment.xml
+++ b/opends/tests/staf-tests/shared/functions/environment.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -130,38 +130,6 @@
</function-prolog>
<sequence>
-
- <!-- fixMe: this needs some cleanup -->
- <script>
- STAXLogMessage = 1
- OPENDS_BINPATH ='%s/%s/bin' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)
- if is_windows_platform(STAF_REMOTE_HOSTNAME):
- fileExt='.bat'
- scriptExt='.bat'
- fileFolder='bat'
- pathSeparator=';'
- newLine='\r\n'
- else:
- fileExt=''
- scriptExt='.sh'
- fileFolder='bin'
- pathSeparator=':'
- newLine='\n'
- </script>
-
- <!-- Default LDAP Server Object -->
- <script>
- server=directory_server()
- server.location = STAF_REMOTE_HOSTNAME
- server.host = DIRECTORY_INSTANCE_HOST
- server.port = DIRECTORY_INSTANCE_PORT
- server.adminport = DIRECTORY_INSTANCE_ADMIN_PORT
- server.dn = DIRECTORY_INSTANCE_DN
- server.password = DIRECTORY_INSTANCE_PSWD
- server.suffix = DIRECTORY_INSTANCE_SFX
- server.backend = DIRECTORY_INSTANCE_BE
- </script>
-
<!-- Default LDAP Server Object -->
<script>
server=directory_server()
@@ -180,10 +148,31 @@
<!-- Initialize any global variables -->
<script>
- CurrentTestPath={}
- DSInfoServersDict={}
True = 1
False = 0
+
+ STAXLogMessage = 1
+ if is_windows_platform(STAF_REMOTE_HOSTNAME):
+ fileExt='.bat'
+ scriptExt='.bat'
+ fileFolder='bat'
+ pathSeparator=';'
+ newLine='\r\n'
+ else:
+ fileExt=''
+ scriptExt='.sh'
+ fileFolder='bin'
+ pathSeparator=':'
+ newLine='\n'
+
+ if DIRECTORY_INSTANCE_BIN != DIRECTORY_INSTANCE_DIR:
+ IPS_PKG = True
+ else:
+ IPS_PKG = False
+
+ CurrentTestPath={}
+ DSInfoServersDict={}
+
# threshold set so that functions such as getFile may not cause staf
# process to run out of memory (value in bytes)
MAX_READABLE_SIZE = 104800
@@ -202,21 +191,70 @@
MultimasterSync = 'Multimaster Synchronization'
MultimasterType = 'multimaster'
- # Replication execution mode variables: if not defined, set random value
- import random
+ # Replication execution mode variables: if not defined, set "random"
+ # values:
+ # (day of the month % 4) == 0 --> (split servers, eclmode n/a)
+ # (day of the month % 4) == 1 --> (don't split, opends eclmode)
+ # (day of the month % 4) == 2 --> (don't split, draft eclmode)
+ # (day of the month % 4) == 3 --> (don't split, eclmode n/a)
+ import time
+ monthday = time.localtime()[2]
+ rewriteConfigFile = False
if REPLICATION_SPLIT_SERVERS == '':
- REPLICATION_SPLIT_SERVERS = random.choice(['true', 'false'])
+ rewriteConfigFile = True
+ oldSplitConfig = """REPLICATION_SPLIT_SERVERS = ''"""
+ if monthday % 4 == 0:
+ REPLICATION_SPLIT_SERVERS = 'true'
+ else:
+ REPLICATION_SPLIT_SERVERS = 'false'
+ newSplitConfig = """REPLICATION_SPLIT_SERVERS = '%s'""" % \
+ REPLICATION_SPLIT_SERVERS
+ else:
+ newSplitConfig = """'REPLICATION_SPLIT_SERVERS = '%s'""" % \
+ REPLICATION_SPLIT_SERVERS
+ oldSplitConfig = newSplitConfig
if REPLICATION_ECL_MODE == '':
- REPLICATION_ECL_MODE = random.choice(['opends', 'draft'])
+ rewriteConfigFile = True
+ oldEclmodeConfig = """REPLICATION_ECL_MODE = ''"""
+ if monthday % 4 == 1:
+ REPLICATION_ECL_MODE = 'opends'
+ elif monthday % 4 == 2:
+ REPLICATION_ECL_MODE = 'draft'
+ else:
+ REPLICATION_ECL_MODE = 'n/a'
+ newEclmodeConfig = """REPLICATION_ECL_MODE = '%s'""" % \
+ REPLICATION_ECL_MODE
+ else:
+ newEclmodeConfig = """REPLICATION_ECL_MODE = '%s'""" % \
+ REPLICATION_ECL_MODE
+ oldEclmodeConfig = newEclmodeConfig
+
+
+ # Rewrite the randomly chosen variables in config.py file
+ if rewriteConfigFile == True :
+ import re
+ splitRegEx = re.compile(oldSplitConfig)
+ eclmodeRegEx = re.compile(oldEclmodeConfig)
+
+ configFile = STAXJobScriptFiles[0]
+ configInput = open(configFile, 'r')
+ c0 = configInput.read()
+ c1 = splitRegEx.sub(newSplitConfig, c0)
+ content = eclmodeRegEx.sub(newEclmodeConfig, c1)
+ configInput.close()
+
+ configOutput = open(configFile,'w')
+ configOutput.write(content)
+ configOutput.close()
# Create staf objects
LOCAL_STAF_ROOT = test_env.staf(STAF_LOCAL_HOSTNAME).root
REMOTE_STAF_ROOT = test_env.staf(STAF_REMOTE_HOSTNAME).root
</script>
- </sequence>
+ </sequence>
</function>
<function name="GetDirectoryServerInformation">
@@ -466,7 +504,7 @@
<call function="'SetFolders'">
{ 'sourceDir' : '%s' % TESTS_ROOT,
- 'localDir' : '%s/%s-jvm%s' % (LOGS_ROOT,logsOS,logsJvm),
+ 'localDir' : '%s' % LOGS_ROOT,
'remoteDir' : DIRECTORY_INSTANCE_DIR }
</call>
@@ -493,6 +531,14 @@
'destfile' : '%s/opends_logo_sm.png' % logs.reports
}
</call>
+
+ <message>'Copy xsl files under %s' % logs.reports</message>
+ <call function="'copyFile'">
+ {
+ 'srcfile' : '%s/gen-groups-report.xsl' % TESTS_XSL_DIR,
+ 'destfile' : '%s/gen-groups-report.xsl' % logs.reports
+ }
+ </call>
</sequence>
</function>
diff --git a/opends/tests/staf-tests/shared/functions/tools.xml b/opends/tests/staf-tests/shared/functions/tools.xml
index 870a1e5..0e079b3 100755
--- a/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opends/tests/staf-tests/shared/functions/tools.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
<!-- This function uses make ldif to generate LDIF data files -->
@@ -1442,6 +1442,12 @@
</function-arg-description>
<function-arg-property name="type" value="integer"/>
</function-arg-def>
+ <function-arg-def name="knownIssue" type="optional" default="None">
+ <function-arg-description>
+ Known issue. Corresponds to an issue number.
+ </function-arg-description>
+ <function-arg-property name="type" value="string" />
+ </function-arg-def>
</function-map-args>
<sequence>
<!-- Build the Command -->
@@ -1492,7 +1498,8 @@
'command' : STAFCmd,
'arguments' : STAFCmdParams,
'location' : location,
- 'expectedRC' : expectedRC
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : knownIssue
}
</call>
diff --git a/opends/tests/staf-tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
index 2155274..05f8bf9 100755
--- a/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opends/tests/staf-tests/shared/functions/topology.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
<function name="createTopology">
@@ -498,15 +498,15 @@
</script>
<!--- In IPS mode, get snmp-mib2605.jar from remote machine-->
- <if expr="DIRECTORY_INSTANCE_BIN != DIRECTORY_INSTANCE_DIR">
- <call function="'copyFile'">
- {
- 'location' : STAF_REMOTE_HOSTNAME,
- 'srcfile' : '%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE),
- 'destfile' : '%s/%s' % (TMPDIR,SNMP_OPENDS_JARFILE),
- 'remotehost' : STAXServiceMachine
- }
- </call>
+ <if expr="IPS_PKG == True">
+ <call function="'copyFile'">
+ {
+ 'location' : STAF_REMOTE_HOSTNAME,
+ 'srcfile' : '%s/%s' % (DIRECTORY_INSTANCE_BIN,SNMP_OPENDS_JARFILE),
+ 'destfile' : '%s/%s' % (TMPDIR,SNMP_OPENDS_JARFILE),
+ 'remotehost' : STAXServiceMachine
+ }
+ </call>
</if>
<!--- Compile snmp java files on controler host -->
@@ -783,6 +783,14 @@
</if>
<!--- Set up DS -->
+
+ <!--- In IPS mode, at this point we need to overwrite dsDir -->
+ <if expr="IPS_PKG == True">
+ <script>
+ dsDir = DIRECTORY_INSTANCE_BIN
+ </script>
+ </if>
+
<message>
'Set up DS on %s : %s/%s' % (dsHost,dsDir,OPENDSNAME)
</message>
@@ -1489,12 +1497,15 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
+ <!-- dsreplication initialize(-all) may fail due to issue:
+ ! #4495: dsreplication initialization produces error message-->
<call function="'runCommand'">
- { 'name' : 'Initialize Replication',
- 'location' : location,
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams,
- 'expectedRC': expectedRC
+ { 'name' : 'Initialize Replication',
+ 'location' : location,
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'expectedRC' : expectedRC,
+ 'knownIssue' : '4495'
}
</call>
<return>
@@ -2026,11 +2037,14 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
+ <!-- dsreplication pre-external-initialization may fail due to issue:
+ ! #4495: dsreplication initialization produces error message-->
<call function="'runCommand'">
- { 'name' : 'Pre-Initialize Replication',
- 'location' : location,
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ { 'name' : 'Pre-Initialize Replication',
+ 'location' : location,
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'knownIssue' : '4495'
}
</call>
<script>
@@ -2169,11 +2183,14 @@
STAFCmdParams=' '.join(STAFCmdParamsList)
</script>
+ <!-- dsreplication post-external-initialization may fail due to issue:
+ ! #4495: dsreplication initialization produces error message-->
<call function="'runCommand'">
- { 'name' : 'Post-Initialize Replication',
- 'location' : location,
- 'command' : STAFCmd,
- 'arguments' : STAFCmdParams
+ { 'name' : 'Post-Initialize Replication',
+ 'location' : location,
+ 'command' : STAFCmd,
+ 'arguments' : STAFCmdParams,
+ 'knownIssue' : '4495'
}
</call>
<script>
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index 933bd79..17bb0e7 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2007-2009 Sun Microsystems, Inc.
+ ! Copyright 2007-2010 Sun Microsystems, Inc.
! -->
<stax>
<function name="checkRC">
@@ -717,7 +717,7 @@
</function-arg-def>
<function-arg-def name="dsPath"
type="optional"
- default="'%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)">
+ default="'%s/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME)">
<function-arg-description>
Pathname to installation root
</function-arg-description>
@@ -871,7 +871,7 @@
<script>
import time
testcaseStart=int(time.time())
- testcaseStartTime=strftime("%Y%m%d@%H:%M:%S",localtime())
+ testcaseStartTime=strftime("%Y%m%d-%H:%M:%S",localtime())
issuesList=[]
for logType in ['errors','access']:
if os.path.exists('%s/%s/logs/%s' % (DIRECTORY_INSTANCE_DIR,OPENDSNAME,logType)):
@@ -930,20 +930,37 @@
else:
information=''
+ nvDone = 0
+ nbFail = 0
+ nbKnown = 0
if numFail == 0:
if numPass == 0:
_status='INCONCLUSIVE'
_result='unknown'
+ nbFail = int(fail.getTextContent()) + 1
+ fail.setTextContent('%s' % nbFail)
+ nbDone = int(done.getTextContent()) + 1
+ done.setTextContent('%s' % nbDone)
else:
_status='PASS'
_result='pass'
+ nbDone = int(done.getTextContent()) + 1
+ done.setTextContent('%s' % nbDone)
else:
if len(issuesList)==0:
_status='FAIL'
_result='fail'
+ nbFail = int(fail.getTextContent()) + 1
+ fail.setTextContent('%s' % nbFail)
+ nbDone = int(done.getTextContent()) + 1
+ done.setTextContent('%s' % nbDone)
else:
_status='KNOWN ISSUES %s' % str(issuesList)
_result='fail'
+ nbKnown = int(known.getTextContent()) + 1
+ known.setTextContent('%s' % nbKnown)
+ nbDone = int(done.getTextContent()) + 1
+ done.setTextContent('%s' % nbDone)
</script>
<message level="'status'">
@@ -953,7 +970,7 @@
<call function="'testCase_EndBanner'" />
<script>
- testcaseEndTime = strftime("%Y%m%d@%H:%M:%S",localtime())
+ testcaseEndTime = strftime("%Y%m%d-%H:%M:%S",localtime())
testcaseStop=int(time.time())
testcaseDuration=testcaseStop-testcaseStart
@@ -990,6 +1007,38 @@
'endat' : testcaseEndTime }
</call>
+ <script>
+ # Update the report.cfg file
+ nbDone = int(done.getTextContent())
+ nbFail = int(fail.getTextContent())
+ nbKnown = int(known.getTextContent())
+ percentage = (nbDone - nbFail - nbKnown) * 100 / nbDone
+
+ starttime = time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(TESTS_TIMESTAMP))
+ duration = time.strftime("%H:%M:%S", time.gmtime(time.time() - TESTS_TIMESTAMP))
+
+ reportCfg = open('%s/logs/report.cfg' % LOGS_ROOT, 'w')
+ reportCfg.write('[Main]\n')
+ reportCfg.write('product = OpenDS_SE2.4 (Directory)\n')
+ if TESTS_TYPE == 'functional-tests':
+ reportCfg.write('category = Functional\n')
+ else:
+ reportCfg.write('category = Stress\n')
+ reportCfg.write('dsconfignumber = -1\n')
+ reportCfg.write('hostname = %s\n' % STAF_REMOTE_HOSTNAME)
+ reportCfg.write('testcasesfail = %s\n' % nbFail)
+ reportCfg.write('testcasesdone = %s\n' % nbDone)
+ reportCfg.write('testcasestotal = 2833\n')
+ reportCfg.write('starttime = %s\n' % starttime)
+ reportCfg.write('duration = %s\n' % duration)
+ reportCfg.write('dsconfigduration = 0\n')
+ reportCfg.write('percentage = %s\n' % percentage)
+ reportCfg.write('allbugs = []\n')
+ reportCfg.write('os = %s\n' % TEST_OS_STRING)
+ reportCfg.write('report = reports/results2.xml\n')
+ reportCfg.write('istemporary = True\n')
+ reportCfg.close()
+ </script>
</sequence>
</function>
@@ -1023,7 +1072,7 @@
<!-- Start time of test suite -->
<script>
- TestSuiteStartTime=strftime("%Y%m%d@%H:%M:%S",localtime())
+ TestSuiteStartTime=strftime("%Y%m%d-%H:%M:%S",localtime())
</script>
<message>
@@ -1059,7 +1108,7 @@
<!-- Start time of test suite -->
<script>
- TestSuiteEndTime=strftime("%Y%m%d@%H:%M:%S",localtime())
+ TestSuiteEndTime=strftime("%Y%m%d-%H:%M:%S",localtime())
</script>
<!-- Format the test group and suite names to create folder -->
@@ -1106,7 +1155,27 @@
qa = doc.getDocumentElement()
ft = qa.getChildNodes().item(1)
results = ft.getChildNodes().item(3)
-
+
+ if results.getChildNodes().item(1):
+ # tempres element already exits
+ xml.tempres = results.getChildNodes().item(1)
+ fail = xml.tempres.getChildNodes().item(1)
+ known = xml.tempres.getChildNodes().item(3)
+ done = xml.tempres.getChildNodes().item(5)
+ else:
+ # Create tempres element
+ xml.tempres = doc.createElement("tempres")
+ results.appendChild(xml.tempres)
+ fail = doc.createElement('fail')
+ xml.tempres.appendChild(fail)
+ fail.appendChild(doc.createTextNode('0'))
+ known = doc.createElement('known')
+ xml.tempres.appendChild(known)
+ known.appendChild(doc.createTextNode('0'))
+ done = doc.createElement('done')
+ xml.tempres.appendChild(done)
+ done.appendChild(doc.createTextNode('0'))
+
#Create testgroup element
xml.testgroup = doc.createElement("testgroup")
xml.createAttr(doc,xml.testgroup,"name",ThisGroupName)
@@ -1802,9 +1871,9 @@
arguments = arguments + ' & set PROCESSRC=%ERRORLEVEL% & exit %PROCESSRC%'
if TESTS_TYPE == 'functional-tests':
- timerDuration = '5m'
+ timerDuration = '10m'
else:
- timerDuration = '24h'
+ timerDuration = '10h'
</script>
<message>
'%s: Running command:\n %s %s\nlocation: %s\nenv: %s\nworkdir: %s' % (_id,command,arguments,location,env,path)
@@ -1905,8 +1974,20 @@
'ERROR: COMMAND HANGING, not completed after %s' % timerDuration
</message>
- <tcstatus result="'fail'"/>
+ <if expr="knownIssue == None">
+ <tcstatus result="'fail'"/>
+ <else>
+ <sequence>
+ <call function="'setKnownIssue'">
+ { 'issueId' : knownIssue }
+ </call>
+ </sequence>
+ </else>
+ </if>
</sequence>
+ <else>
+ <script>RC = cmdRC</script>
+ </else>
</if>
<return>
diff --git a/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java b/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
index b322819..98ac871 100644
--- a/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
+++ b/opends/tests/staf-tests/shared/java/ldapjdk/Writer.java
@@ -25,6 +25,7 @@
* Copyright 2010 Sun Microsystems, Inc.
*/
+
import netscape.ldap.*;
import netscape.ldap.util.*;
import java.util.*;
diff --git a/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java b/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
index 7a62539..dc65a56 100644
--- a/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
+++ b/opends/tests/staf-tests/shared/java/parsingtool/GenerateOpenDSTestSpecs.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
import java.io.*;
import java.lang.*;
@@ -238,7 +238,7 @@
// Index.html
File xmlFilename= new File(strOutputDirName + "/index.xml");
- File xslFilename = new File(strParentDirName + "/../shared/xsl/testspec-index-stylesheet.xsl");
+ File xslFilename = new File(strParentDirName + "/../../shared/xsl/testspec-index-stylesheet.xsl");
File htmlFilename = new File(strOutputDirName + "/index.html");
try{
TransformerFactory transFactory = TransformerFactory.newInstance();
diff --git a/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java b/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
index 87b0569..ddaf7fb 100644
--- a/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
+++ b/opends/tests/staf-tests/shared/java/parsingtool/WriteHTMLFile.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
import java.io.*;
import java.lang.*;
@@ -58,7 +58,7 @@
String xmlFilename;
String htmlFilename;
- File xslFilename = new File(strParentDir + "/../shared/xsl/testspec-stylesheet.xsl");
+ File xslFilename = new File(strParentDir + "/../../shared/xsl/testspec-stylesheet.xsl");
if(group.indexOf("/") < 0)
{
diff --git a/opends/tests/staf-tests/shared/tests/config.py.stubs b/opends/tests/staf-tests/shared/tests/config.py.stubs
index 8b5ef87..4f6e4f9 100644
--- a/opends/tests/staf-tests/shared/tests/config.py.stubs
+++ b/opends/tests/staf-tests/shared/tests/config.py.stubs
@@ -21,7 +21,7 @@
# CDDL HEADER END
#
#
-# Copyright 2007-2009 Sun Microsystems, Inc.
+# Copyright 2007-2010 Sun Microsystems, Inc.
TEST_OS_STRING = '${tests.os.string}'
TEST_JVM_STRING = '${tests.jvm.string}'
@@ -33,6 +33,7 @@
OPENDSNAME = '${opends.name}'
ZIPNAME = '${opends.name}.zip'
ZIPPATH = '${opends.dir}'
+TESTS_TIMESTAMP = '${tests.timestamp}'
TESTS_TYPE = '${tests.type}'
TESTS_ROOT = '${basedir}'
TESTS_DIR = '${tests.dir}'
@@ -45,8 +46,8 @@
TESTS_RESOURCE_DIR = '${shared.dir}/resource'
DIRECTORY_INSTANCE_DN = '${opends.admin.dn}'
DIRECTORY_INSTANCE_PSWD = '${opends.admin.pwd}'
-DIRECTORY_INSTANCE_BIN = '${tests.tmp.dir}'
-DIRECTORY_INSTANCE_DIR = '${tests.tmp.dir}'
+DIRECTORY_INSTANCE_BIN = '${instance.bin}'
+DIRECTORY_INSTANCE_DIR = '${instance.dir}'
DIRECTORY_INSTANCE_HOST = '${remote.hostname}'
DIRECTORY_INSTANCE_PORT = '${opends.port.ldap}'
DIRECTORY_INSTANCE_ADMIN_PORT = '${opends.port.admin}'
@@ -81,3 +82,4 @@
LDCLT_DIR = '${ldclt.dir}'
VERBOSE_MODE = '${verbose.mode}'
TEST_PLAN_CUSTOM = '${test.plan.custom}'
+ORIGINAL_ARCHIVE = '${original.archive}'
diff --git a/opends/tests/staf-tests/shared/tests/runTestJob.xml b/opends/tests/staf-tests/shared/tests/runTestJob.xml
index b3d3a4f..ec5db8d 100644
--- a/opends/tests/staf-tests/shared/tests/runTestJob.xml
+++ b/opends/tests/staf-tests/shared/tests/runTestJob.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Copyright 2006-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -51,6 +51,28 @@
from common import *
</script>
+ <!-- Overwrite the TESTS_TIMESTAMP value defined in the config.py file -->
+ <script>
+ import time
+ timestamp = time.time()
+
+ oldTimeStamp = """TESTS_TIMESTAMP = .*"""
+ newTimeStamp = """TESTS_TIMESTAMP = %s""" % timestamp
+
+ import re
+ timeRegExp = re.compile(oldTimeStamp)
+
+ configFile = STAXJobScriptFiles[0]
+ configInput = open(configFile, 'r')
+ c0 = configInput.read()
+ c1 = timeRegExp.sub(newTimeStamp, c0)
+ configInput.close()
+
+ configOutput = open(configFile,'w')
+ configOutput.write(c1)
+ configOutput.close()
+ </script>
+
<message>'PATH= %s' % sys.path</message>
<!-- Check some of the optional variables from config.py -->
@@ -96,7 +118,9 @@
</message>
<script>
- listOfChildren=STAXResult
+ listOfChildren = STAXResult['listOfChildren']
+ REPLICATION_SPLIT_SERVERS = STAXResult['replication.split']
+ REPLICATION_ECL_MODE = STAXResult['replication.eclmode']
</script>
</sequence>
<else>
@@ -516,7 +540,8 @@
sutElementList.append(['server-package',ServerPackage])
sutElementList.append(['snmp-jarfile',ServerSNMPJarFile])
sutElementList.append(['md5-sum','TDB'])
-
+ sutElementList.append(['original-archive',ORIGINAL_ARCHIVE])
+
write_text_elements(sut,sutElementList)
# Create the sut dsml element
diff --git a/opends/tests/staf-tests/shared/tests/runTests.xml b/opends/tests/staf-tests/shared/tests/runTests.xml
index 46ecd35..dcb06d5 100755
--- a/opends/tests/staf-tests/shared/tests/runTests.xml
+++ b/opends/tests/staf-tests/shared/tests/runTests.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2006-2009 Sun Microsystems, Inc.
+ ! Copyright 2006-2010 Sun Microsystems, Inc.
! -->
<stax>
<defaultcall function="main" />
@@ -38,9 +38,13 @@
<!-- Build list of test groups to run -->
<script>
listOfChildren=[]
+ returnMap = {}
+
+ returnMap['replication.split'] = REPLICATION_SPLIT_SERVERS
+ returnMap['replication.eclmode'] = REPLICATION_ECL_MODE
my_path='%s/%s' % (DIRECTORY_INSTANCE_BIN,OPENDSNAME)
- my_report='%s/results2.xml' % logs.reports
+ my_report='%s/results_tmp.xml' % logs.reports
my_info={}
my_info['jvm label']=TEST_JVM_STRING
my_info['os label']=TEST_OS_STRING
@@ -50,6 +54,43 @@
xml_create_report(PRODUCTNAME,TESTS_TYPE,my_path, \
DSInfo.ServerDict,my_info,local.directory,my_report)
+ # Copy the content of result_tmp.xml to result2.xml
+ # add an xml-stylesheet
+ testlogfh=open(my_report,'r')
+ lines=testlogfh.readlines()
+ file=open('%s/results2.xml' % logs.reports,'w')
+ file.write('%s' % lines[0])
+ file.write('<?xml-stylesheet type="text/xsl" href="gen-groups-report.xsl"?>\n')
+ for l in lines[1:]:
+ file.write('%s' % l)
+ file.close()
+ testlogfh.close()
+
+ # Create the initial report.cfg file
+ # This file is used by the cgi script
+ starttime = time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(TESTS_TIMESTAMP))
+ reportCfg = open('%s/logs/report.cfg' % LOGS_ROOT, 'w')
+ reportCfg.write('[Main]\n')
+ reportCfg.write('product = OpenDS_SE2.4 (Directory)\n')
+ if TESTS_TYPE == 'functional-tests':
+ reportCfg.write('category = Functional\n')
+ else:
+ reportCfg.write('category = Stress\n')
+ reportCfg.write('dsconfignumber = -1\n')
+ reportCfg.write('hostname = %s\n' % STAF_REMOTE_HOSTNAME)
+ reportCfg.write('testcasesfail = 0\n')
+ reportCfg.write('testcasesdone = 0\n')
+ reportCfg.write('testcasestotal = 2833\n')
+ reportCfg.write('starttime = %s\n' % starttime)
+ reportCfg.write('duration = 0\n')
+ reportCfg.write('dsconfigduration = 0\n')
+ reportCfg.write('percentage = 0\n')
+ reportCfg.write('allbugs = []\n')
+ reportCfg.write('os = %s\n' % TEST_OS_STRING)
+ reportCfg.write('report = reports/results2.xml\n')
+ reportCfg.write('istemporary = True\n')
+ reportCfg.close()
+
groupsToRun = []
for line in TEST_PLAN_CUSTOM.split(","):
groupsToRun.append(group_to_run(line.rstrip()))
@@ -146,7 +187,30 @@
</sequence>
</if>
- <return>listOfChildren</return>
+ <!-- Overwrite the TESTS_TIMESTAMP value defined in the config.py file -->
+ <script>
+ oldStatus = 'istemporary = True\n'
+ newStatus = 'istemporary = False\n'
+
+ import re
+ statusRegExp = re.compile(oldStatus)
+
+ reportCfg = '%s/logs/report.cfg' % LOGS_ROOT
+ reportInput = open(reportCfg, 'r')
+ c0 = reportInput.read()
+ c1 = statusRegExp.sub(newStatus, c0)
+ reportInput.close()
+
+ reportOutput = open(reportCfg,'w')
+ reportOutput.write(c1)
+ reportOutput.close()
+ </script>
+
+ <script>
+ returnMap['listOfChildren'] = listOfChildren
+ </script>
+
+ <return>returnMap</return>
</sequence>
diff --git a/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl b/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
index 904383a..8f74a91 100644
--- a/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
+++ b/opends/tests/staf-tests/shared/xsl/gen-groups-report.xsl
@@ -24,7 +24,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -67,6 +67,7 @@
<xsl:variable name="revision" select="normalize-space($sut/revision)"/>
<xsl:variable name="os" select="normalize-space($sut/os-label)"/>
<xsl:variable name="jvm" select="normalize-space($sut/jvm-label)"/>
+ <xsl:variable name="original-archive" select="normalize-space($sut/original-archive)"/>
<xsl:variable name="testgroup" select="results/testgroup"/>
<xsl:variable name="testsuite" select="$testgroup/testsuite"/>
<xsl:variable name="testcase" select="$testsuite/testcase"/>
@@ -109,6 +110,10 @@
<td><div class="collectionheader"><xsl:value-of select="concat('Test Groups Report for ',$productname,' ',$version)"/></div></td>
<td width="10%"><a href="https://opends.dev.java.net/"><img src="./opends_logo_sm.png" alt="OpenDS Logo" width="104" height="33" border="0" align="middle" /></a> </td>
</tr>
+ <tr>
+ <td><xsl:value-of select="concat(' ',$original-archive)"/></td>
+ <td></td>
+ </tr>
</tbody>
</table>
diff --git a/opends/tests/staf-tests/shared/xsl/id.xsl b/opends/tests/staf-tests/shared/xsl/id.xsl
index 2c06714..5e278b2 100644
--- a/opends/tests/staf-tests/shared/xsl/id.xsl
+++ b/opends/tests/staf-tests/shared/xsl/id.xsl
@@ -24,7 +24,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2008-2009 Sun Microsystems, Inc.
+ ! Copyright 2008-2010 Sun Microsystems, Inc.
! -->
<xsl:output method="html" version="4.0" encoding="iso-8859-1" indent="yes"/>
@@ -551,7 +551,7 @@
</xsl:element>
<xsl:element name="br"/>
-
+
<!-- Shaded Line -->
<xsl:element name="hr">
<xsl:attribute name="noshade">
@@ -685,7 +685,7 @@
</xsl:element>
<xsl:for-each select="$testware/service">
-
+
<xsl:element name="tr">
<xsl:element name="td">
<xsl:element name="b">
@@ -762,7 +762,7 @@
</xsl:element>
</xsl:element>
</xsl:element>
-
+
<!-- Shaded Line -->
<xsl:element name="hr">
<xsl:attribute name="noshade">
@@ -772,11 +772,11 @@
<xsl:value-of select="1"/>
</xsl:attribute>
</xsl:element>
-
+
</xsl:element>
-
+
</xsl:element>
</xsl:template>
-</xsl:stylesheet>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
index ed034c9..6181d78 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -77,7 +77,7 @@
testList.append('replication_modify_modifyrdn_multiple')
testList.append('replication_modifyrdn_multiple')
- #testList.append('replication_modify_restart_multiple')
+ testList.append('replication_modify_restart_multiple')
globalAssuredReplication = None
@@ -86,8 +86,11 @@
globalTestExternalChangelog = False
globalExternalChangelogMode = 'n/a'
else:
- globalSplitServers = None
- globalTestExternalChangelog = True
+ globalSplitServers = None
+ if (REPLICATION_ECL_MODE == 'n/a'):
+ globalTestExternalChangelog = False
+ else:
+ globalTestExternalChangelog = True
globalExternalChangelogMode = REPLICATION_ECL_MODE
</script>
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
index 179f38b..9c093c2 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_del_add_del_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -131,8 +131,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
@@ -575,6 +575,7 @@
tmpFile = '%s/ignoreAttrsFile.ldifdiff' % TMPDIR
ignoreAttrs = []
+ ignoreAttrs.append('entryuuid')
ignoreAttrs.append('ds-sync-generation-id')
ignoreAttrs.append('ds-sync-hist')
ignoreAttrs.append('ds-sync-state')
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
index 2727f08..a2daa18 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -124,8 +124,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
index edf7d09..15de8bc 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_delete_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -131,8 +131,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
index 446a0b3..1050d71 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -125,8 +125,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
index 62e4bec..d6c3834 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_mod_delete_search.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -125,8 +125,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
index 6d2bfb7..a73cef3 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_modify_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -131,8 +131,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
index a6966f2..3e46fc8 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_add_search_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -132,8 +132,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
index f1efa92..ed90129 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -212,8 +212,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
index f2764ab..b28c9eb 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_modifyrdn_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -219,8 +219,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
index 2acc31a..b7aa5ea 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modify_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -219,8 +219,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
index 660ec9e..a84b4ed 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -213,8 +213,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
diff --git a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
index 1c58fc7..4dc16ce 100644
--- a/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
+++ b/opends/tests/staf-tests/stress-tests/testcases/replication/replication_modifyrdn_multiple.xml
@@ -23,7 +23,7 @@
!
! CDDL HEADER END
!
- ! Copyright 2009 Sun Microsystems, Inc.
+ ! Copyright 2009-2010 Sun Microsystems, Inc.
! -->
<stax>
@@ -218,8 +218,8 @@
DIRECTORY_INSTANCE_ADMIN_PORT,
DIRECTORY_INSTANCE_SSL_PORT,
None,
- DIRECTORY_INSTANCE_DN,
- DIRECTORY_INSTANCE_PSWD,
+ master.getRootDn(),
+ master.getRootPwd(),
synchroSuffix)
</script>
<call function="'createInstance'">
--
Gitblit v1.10.0