From 036d84b6e8e7d8dd1aa25005b9ca426902b8292b Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Wed, 15 Oct 2008 16:31:28 +0000
Subject: [PATCH] Issue 3521 - backend name and suffix hardcode in some tests
---
opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml | 10
opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml | 16 ++
opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml | 51 ++++----
opends/tests/staf-tests/shared/functions/utils.xml | 46 +++++--
opends/tests/staf-tests/shared/functions/ldap.xml | 2
opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml | 110 +++++------------
opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml | 4
opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml | 4
opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml | 2
opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml | 2
opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml | 6
opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml | 2
opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml | 6
opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml | 2
opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml | 2
opends/tests/staf-tests/functional-tests/testcases/backends/import.xml | 45 +++---
opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml | 2
opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml | 4
opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml | 2
opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml | 6
opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml | 2
opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml | 4
opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml | 14 +-
opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml | 6
24 files changed, 168 insertions(+), 182 deletions(-)
diff --git a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
index 0fb3c77..6b156c1 100755
--- a/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/aci/aci.xml
@@ -50,83 +50,39 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/global_acis.xml' % (TESTS_DIR)"/>
- <call function="'global_acis'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
- <call function="'aci_target'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetattr'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetfilter.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetfilter'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targattrfilter.xml' % (TESTS_DIR)"/>
- <call function="'aci_targattrfilter'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetscope.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetscope'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_targetcontrol.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetcontrol'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_delete_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_delete_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_add_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_add_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_entry.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_entry'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_filter_tests.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_filter_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_compare_tests.xml' % (TESTS_DIR)"/>
- <call function="'aci_compare_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/multiple_aci_tests.xml' % (TESTS_DIR)"/>
- <call function="'multiple_aci_tests'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_modify_rdn.xml' % (TESTS_DIR)"/>
- <call function="'aci_modify_rdn'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_rdn_wildcards.xml' % (TESTS_DIR)"/>
- <call function="'aci_rdn_wildcards'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_bindtypes.xml' % (TESTS_DIR)"/>
- <call function="'aci_bindtypes'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_proxy_auth.xml' % (TESTS_DIR)"/>
- <call function="'aci_proxy_auth'" />
-
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_effective_rights.xml' % (TESTS_DIR)"/>
- <call function="'aci_effective_rights'" />
- <!--
- <import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/aci/aci_import.xml' % (TESTS_DIR)"/>
- <call function="'aci_import'" />
- -->
+
+ <!-- List of ACI test suites to run -->
+ <script>
+ suiteList=[]
+ suiteList.append('global_acis')
+ suiteList.append('aci_target')
+ suiteList.append('aci_targetattr')
+ suiteList.append('aci_targetfilter')
+ suiteList.append('aci_targattrfilter')
+ suiteList.append('aci_targetscope')
+ suiteList.append('aci_targetcontrol')
+ suiteList.append('aci_delete_entry')
+ suiteList.append('aci_add_entry')
+ suiteList.append('aci_modify_entry')
+ suiteList.append('aci_modify_filter_tests')
+ suiteList.append('aci_compare_tests')
+ suiteList.append('multiple_aci_tests')
+ suiteList.append('aci_modify_rdn')
+ suiteList.append('aci_rdn_wildcards')
+ suiteList.append('aci_bindtypes')
+ suiteList.append('aci_proxy_auth')
+ suiteList.append('aci_effective_rights')
+#OOS suiteList.append('aci_import')
+ </script>
+
+ <iterate var="_suite" in="suiteList">
+ <sequence>
+ <import machine="STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/aci/%s.xml' % (TESTS_DIR,_suite)"/>
+ <call function="'%s' % _suite" />
+ </sequence>
+ </iterate>
+
<call function="'testGroup_Postamble'"/>
</sequence>
</block>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml b/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
index 3d9ece8..509d5bd 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/backends/import.xml
@@ -82,7 +82,8 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME ,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
- 'dsBackEnd' : 'userRoot'}
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
+ }
</call>
<call function="'checktestRC'">
@@ -204,7 +205,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeBranch' : ['dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -287,7 +288,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -332,7 +333,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeBranch' : ['ou=Departed,ou=People,dc=example,dc=com'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -422,7 +423,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -464,7 +465,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeAttribute' : ['dc','cn','ou','sn'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -507,7 +508,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -549,7 +550,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeAttribute' : ['userpassword','mail','roomnumber'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -637,7 +638,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=*'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -680,7 +681,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -725,7 +726,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['objectclass=domain','objectclass=organizationalunit'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -770,7 +771,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['objectclass=person','objectclass=organizationalunit'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -812,7 +813,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Include.ldif' % remote.data,
'dsIncludeFilter' : ['|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -855,7 +856,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Exclude.ldif' % remote.data,
'dsExcludeFilter' : ['&(objectclass=person)(ou=Departed)'],
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -940,7 +941,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -984,7 +985,7 @@
'dsLdifFile' : '%s/backends/Append.ldif' % remote.data,
'dsAppend' : 'TRUE',
'dsReplaceExisting' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1027,7 +1028,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif.gz' % remote.data,
'dsIsCompressed' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
<call function="'checktestRC'">
@@ -1069,7 +1070,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsIsEncrypted' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1134,7 +1135,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1177,7 +1178,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Example.ldif' % remote.data,
'dsRejectFile' : '%s/rejects.txt' % TMPDIR,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1220,7 +1221,7 @@
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
'dsSkipSchemaValidation' : 'TRUE',
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -1262,7 +1263,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : STAF_REMOTE_HOSTNAME,
'dsLdifFile' : '%s/backends/Schema.ldif' % remote.data,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
index a10f2ff..dc758c9 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_dbtest_checkbehavior.xml
@@ -87,7 +87,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'userRoot db'
+ 'expectedString' : '%s db' % DIRECTORY_INSTANCE_BE
}
</call>
@@ -131,7 +131,7 @@
<call function="'dbtestWithScript'">
{
'subcommand' : 'list-entry-containers' ,
- 'dsBackendID' : 'userRoot'
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -195,7 +195,7 @@
{
'subcommand' : 'list-index-status' ,
'dsBaseDN' : 'dc=com' ,
- 'dsBackendID' : 'userRoot'
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -268,7 +268,7 @@
{
'subcommand' : 'list-database-containers' ,
'dsBaseDN' : 'dc=com' ,
- 'dsBackendID' : 'userRoot'
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE
}
</call>
@@ -354,7 +354,7 @@
{
'subcommand' : 'dump-database-container' ,
'dsBaseDN' : 'dc=com' ,
- 'dsBackendID' : 'userRoot' ,
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE ,
'dsDatabaseName' : 'dn2id'
}
</call>
@@ -379,7 +379,7 @@
{
'subcommand' : 'dump-database-container' ,
'dsBaseDN' : 'dc=com' ,
- 'dsBackendID' : 'userRoot' ,
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE ,
'dsDatabaseName' : 'st.equality' ,
'dsMinDataSize' : 176 ,
'dsMaxDataSize' : 184
@@ -406,7 +406,7 @@
{
'subcommand' : 'dump-database-container' ,
'dsBaseDN' : 'dc=com' ,
- 'dsBackendID' : 'userRoot' ,
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE ,
'dsDatabaseName' : 'st.equality' ,
'dsMinKeyValue' : 'wv' ,
'dsMaxKeyValue' : 'wy'
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
index bc6bff6..9dcb59f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_ldapsearch_checkbehavior.xml
@@ -167,7 +167,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
'propertyType' : 'backend' ,
- 'propertyName' : 'userRoot' ,
+ 'propertyName' : DIRECTORY_INSTANCE_BE ,
'attributeName' : 'base-dn' ,
'attributeValue' : 'dc=mycom' ,
'modifyType' : 'add'
@@ -187,7 +187,7 @@
'location' : STAF_REMOTE_HOSTNAME ,
'dsAppend' : 'True' ,
'dsLdifFile' : ldifFile ,
- 'dsBackEnd' : 'userRoot'
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
index ba53249..6c7f3ac 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_list-backends_checkbehavior.xml
@@ -92,7 +92,7 @@
<call function="'checktestString'">
{
'returnString' : returnString ,
- 'expectedString' : 'userRoot : dc=com'
+ 'expectedString' : '%s : dc=com' % DIRECTORY_INSTANCE_BE
}
</call>
@@ -178,7 +178,7 @@
<script>
returnString = STAXResult[0][1]
msg1 = 'The provided DN \'dc=com\' is a base DN'
- msg2 = 'for backend \'userRoot\''
+ msg2 = 'for backend \'%s\'' % DIRECTORY_INSTANCE_BE
</script>
<call function="'checktestString'">
@@ -220,7 +220,7 @@
<call function="'listBackendsWithScript'">
{
- 'dsBackendID' : 'userRoot' ,
+ 'dsBackendID' : DIRECTORY_INSTANCE_BE ,
'dsBaseDN' : 'dc=com' ,
'expectedRC' : 1
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
index fe0984b..e131c5e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_make-ldif_checkbehavior.xml
@@ -159,7 +159,7 @@
{
'dsLdifFile' : '%s/make-ldif_seed0_2.ldif' \
% DIRECTORY_INSTANCE_DIR ,
- 'dsBackEnd' : 'userRoot' ,
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE ,
'dsAppend' : 'True'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
index 1c83740..22d311c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/clu/clu_rebuild-index_checkbehavior.xml
@@ -118,7 +118,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : 'create-local-db-index' ,
'objectType' : 'backend-name' ,
- 'objectName' : 'userRoot' ,
+ 'objectName' : DIRECTORY_INSTANCE_BE ,
'optionsString' : '--index-name st --set index-type:equality'
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
index 41fac68..08018fd 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get.xml
@@ -91,7 +91,7 @@
'subcommand' : '%s' % componentList[componentNumber][0] ,
'objectType' : '%s' % componentList[componentNumber][1] ,
'objectName' : '%s' % componentList[componentNumber][2] ,
- 'optionsString' : '--backend-name userroot' ,
+ 'optionsString' : '--backend-name %s' DIRECTORY_INSTANCE_BE ,
'expectedRC' : 0
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
index 019ca4f..2fd8b8a 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list.xml
@@ -83,7 +83,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'subcommand' : '%s' % componentList[componentNumber][0] ,
'objectType' : 'backend-name' ,
- 'objectName' : 'userroot' ,
+ 'objectName' : DIRECTORY_INSTANCE_BE ,
'expectedRC' : 0
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
index 8e0295e..6c3a41f 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/monitoring/monitoring_componant.xml
@@ -210,25 +210,25 @@
<!---
#@TestMarker monitoring componants
#@TestName monitoring componants
-#@TestIssue Check the monitoring of the componant userRoot Backend
+#@TestIssue Check the monitoring of the componant Database Backend
#@TestPreamble none
#@TestStep Check the entry on cn=userRoot Backend,cn=monitor,cn=monitor is available
#@TestPostamble none
-->
- <testcase name="getTestCaseName('userRoot Backend monitoring')">
+ <testcase name="getTestCaseName('Database Backend monitoring')">
<sequence>
<call function="'testCase_Preamble'"/>
<!-- Check the entry on cn=userRoot Backend,cn=monitor is available -->
- <message>'###### Monitor the userRoot Backend ###### '</message>
+ <message>'###### Monitor the dbName Backend ###### '</message>
<call function="'SearchObject'">
{ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'dsBaseDN' : 'cn=userRoot Backend,cn=monitor',
+ 'dsBaseDN' : 'cn=%s Backend,cn=monitor' % DIRECTORY_INSTANCE_BE,
'dsFilter' : 'objectclass=*',
'expectedRC' : 0 }
</call>
@@ -247,7 +247,7 @@
-->
- <testcase name="getTestCaseName('tasks Backend monitoring')">
+ <testcase name="getTestCaseName('Tasks Backend monitoring')">
<sequence>
<call function="'testCase_Preamble'"/>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
index 65c2907..9538e84 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/privileges/privileges_unindexed_searches.xml
@@ -102,7 +102,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
'propertyType' : 'backend' ,
- 'propertyName' : 'userRoot' ,
+ 'propertyName' : DIRECTORY_INSTANCE_BE ,
'attributeName' : 'index-entry-limit' ,
'attributeValue' : '4'
}
@@ -670,7 +670,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
'objectName' : 'backend' ,
'propertyType' : 'backend' ,
- 'propertyName' : 'userRoot' ,
+ 'propertyName' : DIRECTORY_INSTANCE_BE ,
'attributeName' : 'index-entry-limit' ,
'attributeValue' : '4000'
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
index ed9437f..029819c 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/binarycopy/binarycopy.xml
@@ -113,7 +113,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
index 58f86b5..e424663 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/failover/failover.xml
@@ -83,7 +83,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
index 56d9ffa..33daacc 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/ldifimport/ldifimport.xml
@@ -122,7 +122,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
}
</call>
@@ -160,7 +160,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : consumer.getHostname(),
'dsPath' : '%s/%s' % (consumer.getDir(), OPENDSNAME),
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/%s/replication/master_export.ldif' \
% (consumer.getDir(),remote.reldatadir)
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
index ff53897..066324e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/replication_setup.xml
@@ -147,7 +147,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : importDataFile
}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml b/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
index 48ab37c..473ba2e 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/replication/totalupdate/totalupdate.xml
@@ -106,7 +106,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/replication/Example.ldif' % masterDataDir
}
</call>
@@ -408,7 +408,7 @@
<call function="'ImportLdifWithScript'">
{ 'location' : masterHost,
'dsPath' : masterPath,
- 'dsBackEnd' : 'userRoot',
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE,
'dsLdifFile' : '%s/replication/Short_Example.ldif' \
% masterDataDir
}
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
index 6402d72..f6a3e31 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/allowed-tasks.xml
@@ -85,7 +85,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
'startTask' : '0',
- 'backEnd' : 'userRoot',
+ 'backEnd' : DIRECTORY_INSTANCE_BE,
'expectedRC' : 1}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
index 4664820..05e14bb 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/backup_db.xml
@@ -74,7 +74,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupDir' : '%s/tasks/backup_asynchronous' % remote.data,
'startTask' : '0',
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
@@ -143,7 +143,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupDir' : '%s/tasks/backup_synchronous' % remote.data,
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files ---'</message>
@@ -190,7 +190,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'startTask' : '20061212000000',
'backupDir' : '%s/tasks/backup_schedule_asynchronous' % remote.data,
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
index 30b2738..9a2c9c9 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/export-ldif.xml
@@ -72,7 +72,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/tasks/export_asynchronous' % remote.data,
'startTask' : '0',
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files export_asynchronous ---'</message>
<call function="'listFolder'">
@@ -119,7 +119,7 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/tasks/export_synchronous' % remote.data,
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
@@ -188,7 +188,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'ldifFile' : '%s/tasks/export_schedule_asynchronous' % remote.data,
'startTask' : '20061212000000',
- 'backEnd' : 'userRoot'}
+ 'backEnd' : DIRECTORY_INSTANCE_BE}
</call>
<message>'--- Check log files export_asynchronous ---'</message>
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
index 0316b94..30ae1f9 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/import-ldif.xml
@@ -72,7 +72,7 @@
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
- 'dsBackEnd' : 'userRoot'}
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<!-- manage-tasks -->
@@ -152,7 +152,7 @@
'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
'startTask' : '0',
- 'dsBackEnd' : 'userRoot'}
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
@@ -213,7 +213,7 @@
'dsLdifFile' : '%s/tasks/import.ldif' % remote.data,
'dsAppend' : ' ',
'startTask' : '20061212000000',
- 'dsBackEnd' : 'userRoot'}
+ 'dsBackEnd' : DIRECTORY_INSTANCE_BE}
</call>
<call function="'Sleep'">
{ 'location' : STAF_REMOTE_HOSTNAME,
diff --git a/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml b/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
index 2379fed..2f0b056 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/tasks/tasks.xml
@@ -52,11 +52,21 @@
</script>
<call function="'testGroup_Preamble'" />
- <iterate var="_test" in="['setup','restart_db','export-ldif','import-ldif','backup_db','restore_db','allowed-tasks','cleanup']" >
+ <script>
+ testList = []
+ testList.append('setup')
+ testList.append('restart_db')
+ testList.append('export-ldif')
+ testList.append('import-ldif')
+ testList.append('backup_db')
+ testList.append('allowed-tasks')
+ testList.append('cleanup')
+ </script>
+ <iterate var="__test" in="testList" >
<sequence>
<import machine="STAF_LOCAL_HOSTNAME"
- file="'%s/testcases/tasks/%s.xml' % (TESTS_DIR,_test)"/>
- <call function="'%s' % _test" />
+ file="'%s/testcases/tasks/%s.xml' % (TESTS_DIR,__test)"/>
+ <call function="'%s' % __test" />
</sequence>
</iterate>
<call function="'testGroup_Postamble'" />
diff --git a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
index 88463c9..710d220 100644
--- a/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
+++ b/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_setup.xml
@@ -52,7 +52,7 @@
<block name="'setup'">
<sequence>
- <block name="'Block Create DS Topology'">
+ <block name="'Create DS Topology'">
<!-- Create the topology necessary to the tests -->
<sequence>
<message>
@@ -67,31 +67,10 @@
</call>
</sequence>
- <!--- End Block Create DS Topology -->
</block>
-
- <if expr="loadBackend == True">
- <block name="'Block DS Load Data'">
- <!-- Load the data needed by the test suite -->
- <sequence>
- <message>
- '------ Load LDIF : virtualAttributes.ldif'
- </message>
- <call function="'importLdif'">
- {'ldifFile' : '%s/virtualAttributes/virtualAttributes.ldif'
- % remote.data }
- </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
- <!--- End Block DS Load Data -->
- </block>
- </if>
-
+
<if expr="startDS == True">
- <block name="'Block DS Process Active'">
+ <block name="'Start DS'">
<!--- Start DS -->
<sequence>
<message>
@@ -111,7 +90,29 @@
'noOfMilliSeconds' : 2000 }
</call>
</sequence>
- <!--- End Block DS Process Active -->
+ </block>
+ </if>
+ <if expr="loadBackend == True">
+ <block name="'Load Backend Data'">
+ <!-- Load the data needed by the test suite -->
+ <sequence>
+ <message>
+ '------ Load LDIF : virtualAttributes.ldif'
+ </message>
+ <call function="'ldapModifyWithScript'">
+ { 'dsAdd' : 'True',
+ 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'dsFilename' : '%s/virtualAttributes/virtualAttributes.ldif' \
+ % remote.data,
+ 'dsContinueOnError' : 'true',
+ 'expectedRC' : 0
+ }
+ </call>
+
+ </sequence>
</block>
</if>
</sequence>
diff --git a/opends/tests/staf-tests/shared/functions/ldap.xml b/opends/tests/staf-tests/shared/functions/ldap.xml
index 0281349..2523f43 100755
--- a/opends/tests/staf-tests/shared/functions/ldap.xml
+++ b/opends/tests/staf-tests/shared/functions/ldap.xml
@@ -158,7 +158,7 @@
</function-arg-def>
<function-arg-def name="dsAdd" type="optional">
<function-arg-description>
- Continue processing even if there are errors
+ Add the entries
</function-arg-description>
<function-arg-property name="type" value="option"/>
</function-arg-def>
diff --git a/opends/tests/staf-tests/shared/functions/utils.xml b/opends/tests/staf-tests/shared/functions/utils.xml
index 14c5ba3..de7a80b 100755
--- a/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opends/tests/staf-tests/shared/functions/utils.xml
@@ -333,7 +333,7 @@
<else>
<sequence>
<tcstatus result="'fail'"/>
- <message log="1">
+ <message log="1" level="'Error'">
'ERROR : Did Not Find substring, %s, in the return string' % (testString)
</message>
</sequence>
@@ -353,7 +353,7 @@
<else>
<sequence>
<tcstatus result="'fail'"/>
- <message log="1">
+ <message log="1" level="'Error'">
'ERROR : Found substring, %s, in the return string' % (testString)
</message>
</sequence>
@@ -1461,6 +1461,12 @@
The duration that the process is allowed to run
</function-arg-description>
</function-arg-def>
+ <function-arg-def name="inputFile" type="optional" default="'None'">
+ <function-arg-description>
+ input file containing the command input
+ </function-arg-description>
+ <function-arg-property name="type" value="file"/>
+ </function-arg-def>
<function-arg-def name="outputFile" type="optional" default="'None'">
<function-arg-description>
Output file containing the command output
@@ -1516,18 +1522,30 @@
<stderr mode="'stdout'"/>
<returnstdout/>
</process>
- <else>
- <process name="name">
- <location>location</location>
- <command>command</command>
- <parms>arguments</parms>
- <workdir>path</workdir>
- <envs>env</envs>
- <console use="'same'"/>
- <stdout if="outputFile != 'None'" mode="'replace'">'%s' % outputFile</stdout>
- <returnstdout/>
- </process>
- </else>
+ <elseif expr="inputFile != 'None'">
+ <process name="name">
+ <location>location</location>
+ <command>command</command>
+ <parms>arguments</parms>
+ <workdir>path</workdir>
+ <envs>env</envs>
+ <console use="'same'"/>
+ <stdin>'%s' % inputFile</stdin>
+ <returnstdout/>
+ </process>
+ </elseif>
+ <else>
+ <process name="name">
+ <location>location</location>
+ <command>command</command>
+ <parms>arguments</parms>
+ <workdir>path</workdir>
+ <envs>env</envs>
+ <console use="'same'"/>
+ <stdout if="outputFile != 'None'" mode="'replace'">'%s' % outputFile</stdout>
+ <returnstdout/>
+ </process>
+ </else>
</if>
<!-- The problem here is that STAXResult can either be a
--
Gitblit v1.10.0