From 94905db3f92f5eeedd88d22954a349fe1b8605ba Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Fri, 28 May 2010 09:47:08 +0000
Subject: [PATCH] Update tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml | 2
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml | 3
opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java | 8
opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml | 8
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml | 187 ++++++++++++++++++++++++++++++++++++-
opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml | 11 +
opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml | 31 ++++-
opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java | 2
8 files changed, 224 insertions(+), 28 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
index 7857960..3b7f272 100755
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks_tests.xml
@@ -85,7 +85,8 @@
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
'backupDir' : '%s/backends/backup1' % remote.data,
- 'extraParams' : '--completionNotify foo@example.com'
+ 'extraParams' : '--completionNotify foo@example.com',
+ 'knownIssue' : '6947587'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
index 783f4c5..a20f0a2 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/indexes/indexes.xml
@@ -42,10 +42,10 @@
<script>
CurrentTestPath['group'] = 'indexes'
envAlreadyLoaded='true'
- _testSteps=['indexes_setup','indexes_search','indexes_dynamic_modify',
- 'indexes_dynamic_add','indexes_remove','indexes_add',
- 'indexes_modify','indexes_entry_limit',
- 'indexes_vlv_add', 'indexes_cleanup']
+ _testSteps=['indexes_setup','indexes_search','indexes_modify',
+ 'indexes_dynamic_modify','indexes_add',
+ 'indexes_dynamic_add','indexes_remove',
+ 'indexes_entry_limit','indexes_vlv_add','indexes_cleanup']
</script>
<!---
#@TestSuiteName Indexes
@@ -191,6 +191,55 @@
<call function="'loopThroughFilters'">
{ 'filters' : 'after-modify' }
</call>
+
+ <testcase name="getTestCaseName('Restore and rebuild uid index')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'modifyIndex',
+ 'functionMessage' : 'Adding substring index to attribute uid',
+ 'functionArguments' : { 'operation' : 'remove',
+ 'indexAttribute' : 'uid',
+ 'indexProperty' : 'index-type',
+ 'indexPropertyValue' : 'substring'
+ }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'StopDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'rebuildIndexWithScript' ,
+ 'functionArguments' : { 'dsBaseDN' : DIRECTORY_INSTANCE_SFX ,
+ 'dsIndexList' : [ 'uid' ] ,
+ 'knownIssue' : '6931704'
+ }
+ }
+ </call>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'StartDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
+ }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
</sequence>
<catch exception="'STAXException.LDAP.ModifyException'">
<message log="1" level="'fatal'">
@@ -273,6 +322,55 @@
<call function="'loopThroughFilters'">
{ 'filters' : 'after-modify' }
</call>
+
+ <testcase name="getTestCaseName('Restore and rebuild uid index')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'modifyIndex',
+ 'functionMessage' : 'Adding substring index to attribute uid',
+ 'functionArguments' : { 'operation' : 'remove',
+ 'indexAttribute' : 'uid',
+ 'indexProperty' : 'index-type',
+ 'indexPropertyValue' : 'substring'
+ }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'StopDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN ,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'rebuildIndexWithScript' ,
+ 'functionArguments' : { 'dsBaseDN' : DIRECTORY_INSTANCE_SFX ,
+ 'dsIndexList' : [ 'uid' ] ,
+ 'knownIssue' : '6931704'
+ }
+ }
+ </call>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'StartDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
+ }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
</sequence>
<catch exception="'STAXException.LDAP.ModifyException'">
<message log="1" level="'fatal'">
@@ -321,7 +419,7 @@
{ 'filters' : 'before-add' }
</call>
- <testcase name="getTestCaseName('Add and rebuild uid index')">
+ <testcase name="getTestCaseName('Add and rebuild l index')">
<sequence>
<call function="'testCase_Preamble'"/>
@@ -373,6 +471,21 @@
<call function="'loopThroughFilters'">
{ 'filters' : 'after-add' }
</call>
+
+ <testcase name="getTestCaseName('Remove l index and rebuild all indexes')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'removeIndex',
+ 'functionMessage' : 'Removing index on attribute l' ,
+ 'functionArguments' : { 'indexAttribute' : 'l' }
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
</sequence>
<catch exception="'STAXException.LDAP.AddIndexException'">
<message log="1" level="'fatal'">
@@ -458,6 +571,21 @@
<call function="'loopThroughFilters'">
{ 'filters' : 'after-add' }
</call>
+
+ <testcase name="getTestCaseName('Remove l index and rebuild all indexes')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'removeIndex',
+ 'functionMessage' : 'Removing index on attribute l' ,
+ 'functionArguments' : { 'indexAttribute' : 'l' }
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
</sequence>
<catch exception="'STAXException.LDAP.AddIndexException'">
<message log="1" level="'fatal'">
@@ -501,6 +629,55 @@
<try>
<sequence>
+ <testcase name="getTestCaseName('Add and rebuild l index')">
+ <sequence>
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'runFunction'">
+ { 'functionName' : 'addIndex',
+ 'functionMessage' : 'Adding presence and equality index to \
+ attribute l',
+ 'functionArguments' : { 'indexAttribute' : 'l',
+ 'indexTypes' : [ 'presence',
+ 'equality' ]
+ }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'StopDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsAdminPort' : DIRECTORY_INSTANCE_ADMIN_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD
+ }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'rebuildIndexWithScript' ,
+ 'functionArguments' : { 'dsBaseDN' : DIRECTORY_INSTANCE_SFX ,
+ 'dsIndexList' : [ 'l' ] ,
+ 'knownIssue' : '6931704'
+ }
+ }
+ </call>
+ <call function="'runFunction'">
+ { 'functionName' : 'StartDsWithScript',
+ 'functionArguments' : { 'location' : STAF_REMOTE_HOSTNAME }
+ }
+ </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ {
+ 'noOfLoops' : 10 ,
+ 'noOfMilliSeconds' : 2000
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+ </sequence>
+ </testcase>
+
<call function="'loopThroughFilters'">
{ 'filters' : 'before-remove' }
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
index 1680138..f50c0b8 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/replication/externalchangelog/externalchangelog_common_ecl_tests.xml
@@ -10930,7 +10930,7 @@
# 'employeenumber' contained no value prior to the modify op, so
# expect NO 'targetemployeenumber' include-attr to be present
# in the changelog entry
- myMissingIncAttrs = [incAttr[0]]
+ myMissingIncAttrs = [incAttrs[0]]
if ecl_mode != 'opends':
myChangeNumber = searchIndex
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
index 1595f7c..c3c9c58 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/security.xml
@@ -393,7 +393,9 @@
listAttr.append('userCertificate;binary:: %s' % ret_str)
</script>
- <!-- Create the ldif -->
+ <message>
+ 'Create %s/client.ldif' % local.temp
+ </message>
<script>
addCertificateldif='%s/client.ldif' % local.temp
outfile = open(addCertificateldif,"w")
@@ -402,10 +404,13 @@
outfile.close()
</script>
+ <message>
+ 'Copy %s/client.ldif to %s' % (local.temp,ldif_path)
+ </message>
<call function="'copyFile'">
{
'location' : STAXServiceMachine,
- 'srcfile' : '%s/client-cert.ldif' % local.temp,
+ 'srcfile' : '%s/client.ldif' % local.temp,
'destfile' : ldif_path,
'remotehost' : STAF_REMOTE_HOSTNAME
}
@@ -417,7 +422,7 @@
'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'entryToBeModified' : addCertificateldif,
+ 'entryToBeModified' : ldif_path,
'expectedRC' : 0
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
index 9fcc19c..353dccc 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/tools.xml
@@ -1038,14 +1038,26 @@
</function-list-args>
<sequence>
- <!-- Start the servers in the list -->
- <script>
- # check if using coverage in which case we'll avoid doing parallele iterate
- coverage = False
- if os.path.exists(os.path.join(serverList[0].getDir(),OPENDSNAME,'lib','emma.jar')):
- coverage = True
- print 'tools.xml - coverage=%s' % coverage
- </script>
+
+ <!-- Check if using coverage in which case we'll avoid doing parallele iterate -->
+ <!-- Check if 'emma.jar' exists -->
+ <call function="'GetEntry'">
+ {
+ 'location' : STAF_REMOTE_HOSTNAME ,
+ 'entry' : '%s/%s/lib/emma.jar' % (serverList[0].getDir(),OPENDSNAME) ,
+ 'attribute' : 'TYPE'
+ }
+ </call>
+ <if expr="RC != 48">
+ <!-- 'emma.jar' exists -->
+ <script>coverage = True</script>
+ <else>
+ <script>coverage = False</script>
+ </else>
+ </if>
+ <message>'tools.xml - coverage=%s' % coverage</message>
+
+ <!-- Start the servers in the list -->
<if expr="coverage == True">
<sequence>
<message>'starting servers in sequence using "iterate"'</message>
@@ -1595,7 +1607,8 @@
'dsInstanceDn' : dsInstanceDn ,
'dsInstancePswd' : dsInstancePswd ,
'dsInfo' : taskId ,
- 'dsQuiet' : 'True'
+ 'dsQuiet' : 'True' ,
+ 'expectedRC' : 'noCheck'
}
</call>
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
index b3580c3..cd648e8 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/utils.xml
@@ -1248,7 +1248,7 @@
ThisGroupName=CurrentTestPath['group']
else:
ThisGroupName='unknown-group'
-
+
coverage='N/A'
</script>
@@ -4017,13 +4017,13 @@
STAFCmdParamsList.append('-p %s' % dsInstancePort)
if dsInstanceDn:
- STAFCmdParamsList.append('-D %s' % dsInstanceDn)
+ STAFCmdParamsList.append('-D "%s"' % dsInstanceDn)
if dsBaseDn:
- STAFCmdParamsList.append('-b %s' % dsBaseDn)
+ STAFCmdParamsList.append('-b "%s"' % dsBaseDn)
if dsInstancePswd:
- STAFCmdParamsList.append('-w %s' % dsInstancePswd)
+ STAFCmdParamsList.append('-w "%s"' % dsInstancePswd)
if display:
STAFCmdParamsList.append('-s')
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
index 925b523..3636639 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearch.java
@@ -136,7 +136,7 @@
ps.start();
}
- try {
+ try {
STAFHandle handle = new STAFHandle("PSearch listener");
handle.submit2(hostname, "SEM", "PULSE EVENT PSearch/Ready");
handle.submit2(hostname, "SEM", "WAIT EVENT PSearch tests/Completed");
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
index de6c8f8..12cf44c 100644
--- a/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
+++ b/opendj-sdk/opends/tests/staf-tests/shared/java/ldapjdk/PSearchOperations.java
@@ -138,8 +138,8 @@
if(!ldifFormat)
write("[Thread id: " + threadId + "] \n" + getDate() + connection);
} catch (LDAPException ex) {
- System.out.println("[Thread id: " + threadId + "]Connection :" + ex.getMessage());
- System.exit(0);
+ System.out.println("[Thread id: " + threadId + "] Connection :" + ex.getMessage());
+ System.exit(1);
}
}
/**
@@ -189,8 +189,8 @@
// Start the persistent search.
res = connection.search(suffix, LDAPv3.SCOPE_SUB, "(objectclass=*)", null, false, cons);
} catch (LDAPException ex) {
- System.out.println("[Thread id: " + threadId + "]LDAPSearch :" + ex.getMessage());
- System.exit(0);
+ System.out.println("[Thread id: " + threadId + "] LDAPSearch :" + ex.getMessage());
+ System.exit(1);
}
return res;
}
--
Gitblit v1.10.0