From e832b2548211098c93ff487495bc6fb2fac7b922 Mon Sep 17 00:00:00 2001
From: gary_williams <gary_williams@localhost>
Date: Thu, 15 Mar 2007 10:09:56 +0000
Subject: [PATCH] Issue 1365 remove parallel script for opends not starting in background
---
opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml | 129
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml | 118
opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml | 126
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml | 131
opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml | 2
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml | 4
opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml | 133
opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml | 124
opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml | 139 -
opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml | 123
opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml | 129
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml | 205 +-
opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml | 2670 ++++++++++++++++----------------
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml | 203 +-
opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml | 161 -
opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml | 147 -
opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml | 147 -
opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml | 109
18 files changed, 2,218 insertions(+), 2,582 deletions(-)
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
index e50e03d..68fac09 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci.xml
@@ -42,89 +42,66 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <parallel>
-
- <block name="'Block DS Process Active'">
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
- <call function="'aci_setup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
- <call function="'aci_target'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetattr'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_targetfilter_syntax.xml' % (TESTS_DIR)"/>
- <call function="'aci_targetfilter_syntax'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
- <call function="'aci_teardown'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_setup.xml' % (TESTS_DIR)"/>
+ <call function="'aci_setup'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_target.xml' % (TESTS_DIR)"/>
+ <call function="'aci_target'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_targetattr.xml' % (TESTS_DIR)"/>
+ <call function="'aci_targetattr'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_targetfilter_syntax.xml' % (TESTS_DIR)"/>
+ <call function="'aci_targetfilter_syntax'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/aci/aci_teardown.xml' % (TESTS_DIR)"/>
+ <call function="'aci_teardown'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testGroup_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
index 43a24c2..2679e06 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/aci/aci_targetattr.xml
@@ -41,6 +41,8 @@
CurrentTestPath['suite']=STAXCurrentBlock
</script>
+ <call function="'testSuite_Preamble'"/>
+
<!---
Place suite-specific test information here.
#@TestSuiteName ACI Targetattr Tests
@@ -1327,6 +1329,8 @@
</sequence>
</testcase>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
index 33a1aeb..43fd2f5 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -44,1363 +44,1337 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!--- Test Suite information
+ #@TestSuiteName Backend Import Tasks Tests
+ #@TestSuitePurpose Verify that the basic import using the task based functionality is working in the Directory Server.
+ #@TestSuiteID Import Tasks Tests
+ #@TestSuiteGroup Import-Tasks
+ #@TestGroup Backend
+ #@TestScript import-tasks.xml
+ #@TestHTMLLink http://opends.dev.java.net/
+ -->
- <!--- Block : DS -->
- <block name="'Block DS Process Active'">
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Import Tasks: LDIF Default
+ #@TestID LDIF Default
+ #@TestPurpose Verify an import task of a LDIF file using the default backend.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: LDIF Default'">
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
+ }
</call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
- <!--- Block : DS -->
- </block>
-
- <!--- Block : Test Cases -->
- <block name="'Block Test Cases Active'">
-
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: LDIF Non Default
+ #@TestID LDIF Non Default
+ #@TestPurpose Verify an import task of a LDIF file using a differrent backend to the default.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Include Branch
+ #@TestID Fractional Include Branch
+ #@TestPurpose Verify an import task of a LDIF file specifying a branch that should be included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Include Branch'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeBranches' : 'dc=com',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Include Branches
+ #@TestID Fractional Include Branches
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple branches that should be included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Include Branches'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeBranches' : ['dc=com','dc=example,dc=com']
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Exclude Branch
+ #@TestID Fractional Exclude Branch
+ #@TestPurpose Verify an import task of a LDIF file specifying a branch that should be excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Exclude Branch'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Exclude Branches
+ #@TestID Fractional Exclude Branches
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple branches that should be excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Exclude Branches'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com',
+ 'cn=QA Managers,ou=groups,dc=example,dc=com']
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=bbaret,cn=QA Managers,ou=groups,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Branches Mix
+ #@TestID Fractional Branches Mix
+ #@TestPurpose Verify an import task of a LDIF file specifying a mix of include and exclude branches.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Branches Mix'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'includeBranches' : 'dc=com',
+ 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Include Attribute
+ #@TestID Fractional Include Attribute
+ #@TestPurpose Verify an import task of a LDIF file specifying an attribute that should be included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Include Attribute'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeAttributes' : 'dc',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
+ 'missingEntries' : ['ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Include Attributes
+ #@TestID Fractional Include Attributes
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple attributes that should be included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Include Attributes'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeAttributes' : ['dc','cn','ou','sn']
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Exclude Attribute
+ #@TestID Fractional Exclude Attribute
+ #@TestPurpose Verify an import task of a LDIF file specifying an attribute that should be excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Exclude Attribute'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeAttributes' : 'userpassword'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
+ 'missingAttributes' : ['userpassword'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Exclude Attributes
+ #@TestID Fractional Exclude Attributes
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple attribute that should be excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Exclude Attributes'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeAttributes' : ['userpassword','mail','roomnumber']
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
+ 'missingAttributes' : ['userpassword','mail','roomnumber'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Mix
+ #@TestID Fractional Mix
+ #@TestPurpose Verify an import task of a LDIF file specifying a mix of fractional attributes and branches.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Mix'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'includeBranches' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
+ 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
+ 'includeAttributes' : ['dc','cn','ou','sn'],
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller, ou=People, dc=example,dc=com',
+ 'uid=rhunt, ou=People, dc=example,dc=com'],
+ 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Include
+ #@TestID Filtered Include
+ #@TestPurpose Verify an import task of a LDIF file specifying a search filter control which entries are included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Include'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeFilters' : 'objectclass=*',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Exclude
+ #@TestID Filtered Exclude
+ #@TestPurpose Verify an import task of a LDIF file specifying a search filter control which entries are excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Exclude'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeFilters' : 'objectclass=person',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['dc=example,dc=com',
+ 'ou=People,dc=example,dc=com'],
+ 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Includes
+ #@TestID Filtered Includes
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple search filters control which entries are included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Includes'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeFilters' : ['objectclass=domain*','objectclass=organizationalunit']
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['dc=example,dc=com',
+ 'ou=People,dc=example,dc=com'],
+ 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Excludes
+ #@TestID Filtered Excludes
+ #@TestPurpose Verify an import task of a LDIF file specifying multiple search filters control which entries are excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Excludes'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeFilters' : ['objectclass=person','objectclass=organizationalunit'],
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['dc=example,dc=com'],
+ 'missingEntries' : ['ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Includes Complex
+ #@TestID Filtered Includes Complex
+ #@TestPurpose Verify an import task of a LDIF file specifying complex search filters control which entries are included in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Includes Complex'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
+ 'includeFilters' : '|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Filtered Excludes Complex
+ #@TestID Filtered Excludes Complex
+ #@TestPurpose Verify an import task of a LDIF file specifying complex search filters control which entries are excluded in the import.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Filtered Excludes Complex'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeFilters' : '&(objectclass=person)(ou=Departed)',
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=rhunt,ou=People,dc=example,dc=com'],
+ 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Fractional Filtered Mix
+ #@TestID Fractional Filtered Mix
+ #@TestPurpose Verify an import task of a LDIF file specifying a mix of fractional and filtered.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Fractional Filtered Mix'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
+ 'excludeFilters' : '&(objectclass=person)(ou=Departed)',
+ 'includeBranches' : 'dc=com',
+ 'excludeAttributes' : 'userpassword'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
+ 'missingAttributes' : ['userpassword'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Append
+ #@TestID Append
+ #@TestPurpose Verify an import task of a LDIF file specifying that the import process should append to the existing database.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Append'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
+ 'append' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks:Append Replace Existing
+ #@TestID Append Replace Existing
+ #@TestPurpose Verify an import task of a LDIF file specifying that an existing entry should be replaced when appending to an existing database.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Append Replace Existing'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
+ 'append' : 'TRUE',
+ 'replaceExisting' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
+ 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Compressed
+ #@TestID Compressed
+ #@TestPurpose Verify an import task of a LDIF file specifying the data to import is compressed.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Compressed'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Example.ldif.gz' % STAGED_DATA_DIR,
+ 'isCompressed' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Encrypted
+ #@TestID Encrypted
+ #@TestPurpose Verify an import task of a LDIF file specifying the data to import is encrypted.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Encrypted'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
+ 'isEncrypted' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <!-- This test should fail. -->
+ <tcstatus result="'fail'"/>
+ <message log="1" level="'Error'">
+ 'Error: Known bug. Issue 839: Encrypted LDIF export is not implemented'
+ </message>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Hashed Signed
+ #@TestID Hashed Signed
+ #@TestPurpose Verify an import task of a LDIF file specifying the data to import is hashed/signed.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <!-- Test Not Implemented. Feature not avaliable -->
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Rejects File
+ #@TestID Rejects File
+ #@TestPurpose Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is not overwritten.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Rejects File'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
+ 'rejectsFile' : './rejects'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <!-- Should check there is a rejects file and the contents are correct -->
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Rejects File Overwrite
+ #@TestID Rejects File Overwrite
+ #@TestPurpose Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is overwritten.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Rejects File'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
+ 'rejectsFile' : './rejects',
+ 'overwriteRejectsFile' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=rhunt,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <!-- Should check there is a rejects file and the contents are correct -->
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Skip Schema Validation Accept
+ #@TestID Skip Schema Validation Accept
+ #@TestPurpose Verify an import task of a LDIF file containing invalided schema is accepted when skip schema validation is specified
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Skip Schema Validation Accept'">
+
<sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
+ 'skipSchemaValidation' : 'TRUE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
</call>
- <!--- Test Suite information
- #@TestSuiteName Backend Import Tasks Tests
- #@TestSuitePurpose Verify that the basic import using the task based functionality is working in the Directory Server.
- #@TestSuiteID Import Tasks Tests
- #@TestSuiteGroup Import-Tasks
- #@TestGroup Backend
- #@TestScript import-tasks.xml
- #@TestHTMLLink http://opends.dev.java.net/
- -->
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Import Tasks: LDIF Default
- #@TestID LDIF Default
- #@TestPurpose Verify an import task of a LDIF file using the default backend.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: LDIF Default'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: LDIF Non Default
- #@TestID LDIF Non Default
- #@TestPurpose Verify an import task of a LDIF file using a differrent backend to the default.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Include Branch
- #@TestID Fractional Include Branch
- #@TestPurpose Verify an import task of a LDIF file specifying a branch that should be included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=dmiller,ou=People,dc=example,dc=com',
+ 'uid=kwinters,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
- <testcase name="'Backend: Import Tasks: Fractional Include Branch'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeBranches' : 'dc=com',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Include Branches
- #@TestID Fractional Include Branches
- #@TestPurpose Verify an import task of a LDIF file specifying multiple branches that should be included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Include Branches'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeBranches' : ['dc=com','dc=example,dc=com']
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Exclude Branch
- #@TestID Fractional Exclude Branch
- #@TestPurpose Verify an import task of a LDIF file specifying a branch that should be excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Exclude Branch'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Exclude Branches
- #@TestID Fractional Exclude Branches
- #@TestPurpose Verify an import task of a LDIF file specifying multiple branches that should be excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Exclude Branches'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeBranches' : ['ou=Departed,ou=People,dc=example,dc=com',
- 'cn=QA Managers,ou=groups,dc=example,dc=com']
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=bbaret,cn=QA Managers,ou=groups,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Branches Mix
- #@TestID Fractional Branches Mix
- #@TestPurpose Verify an import task of a LDIF file specifying a mix of include and exclude branches.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Branches Mix'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'includeBranches' : 'dc=com',
- 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Include Attribute
- #@TestID Fractional Include Attribute
- #@TestPurpose Verify an import task of a LDIF file specifying an attribute that should be included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Include Attribute'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeAttributes' : 'dc',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['dc=com','dc=example,dc=com'],
- 'missingEntries' : ['ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Include Attributes
- #@TestID Fractional Include Attributes
- #@TestPurpose Verify an import task of a LDIF file specifying multiple attributes that should be included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Include Attributes'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeAttributes' : ['dc','cn','ou','sn']
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Exclude Attribute
- #@TestID Fractional Exclude Attribute
- #@TestPurpose Verify an import task of a LDIF file specifying an attribute that should be excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Exclude Attribute'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeAttributes' : 'userpassword'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
- 'missingAttributes' : ['userpassword'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Exclude Attributes
- #@TestID Fractional Exclude Attributes
- #@TestPurpose Verify an import task of a LDIF file specifying multiple attribute that should be excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Exclude Attributes'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeAttributes' : ['userpassword','mail','roomnumber']
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
- 'missingAttributes' : ['userpassword','mail','roomnumber'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Mix
- #@TestID Fractional Mix
- #@TestPurpose Verify an import task of a LDIF file specifying a mix of fractional attributes and branches.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Mix'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'includeBranches' : ['dc=com','dc=example,dc=com','ou=People,dc=example,dc=com'],
- 'excludeBranches' : 'ou=Departed,ou=People,dc=example,dc=com',
- 'includeAttributes' : ['dc','cn','ou','sn'],
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller, ou=People, dc=example,dc=com',
- 'uid=rhunt, ou=People, dc=example,dc=com'],
- 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Include
- #@TestID Filtered Include
- #@TestPurpose Verify an import task of a LDIF file specifying a search filter control which entries are included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Include'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeFilters' : 'objectclass=*',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Exclude
- #@TestID Filtered Exclude
- #@TestPurpose Verify an import task of a LDIF file specifying a search filter control which entries are excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Exclude'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeFilters' : 'objectclass=person',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['dc=example,dc=com',
- 'ou=People,dc=example,dc=com'],
- 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Includes
- #@TestID Filtered Includes
- #@TestPurpose Verify an import task of a LDIF file specifying multiple search filters control which entries are included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Includes'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeFilters' : ['objectclass=domain*','objectclass=organizationalunit']
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['dc=example,dc=com',
- 'ou=People,dc=example,dc=com'],
- 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Excludes
- #@TestID Filtered Excludes
- #@TestPurpose Verify an import task of a LDIF file specifying multiple search filters control which entries are excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Excludes'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeFilters' : ['objectclass=person','objectclass=organizationalunit'],
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['dc=example,dc=com'],
- 'missingEntries' : ['ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Includes Complex
- #@TestID Filtered Includes Complex
- #@TestPurpose Verify an import task of a LDIF file specifying complex search filters control which entries are included in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Includes Complex'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Include.ldif' % STAGED_DATA_DIR,
- 'includeFilters' : '|(objectclass=person)(objectclass=domain)(objectclass=organizationalunit)',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Filtered Excludes Complex
- #@TestID Filtered Excludes Complex
- #@TestPurpose Verify an import task of a LDIF file specifying complex search filters control which entries are excluded in the import.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Filtered Excludes Complex'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeFilters' : '&(objectclass=person)(ou=Departed)',
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=rhunt,ou=People,dc=example,dc=com'],
- 'missingEntries' : ['uid=fvinker,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Fractional Filtered Mix
- #@TestID Fractional Filtered Mix
- #@TestPurpose Verify an import task of a LDIF file specifying a mix of fractional and filtered.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Fractional Filtered Mix'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Exclude.ldif' % STAGED_DATA_DIR,
- 'excludeFilters' : '&(objectclass=person)(ou=Departed)',
- 'includeBranches' : 'dc=com',
- 'excludeAttributes' : 'userpassword'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com'],
- 'missingAttributes' : ['userpassword'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Append
- #@TestID Append
- #@TestPurpose Verify an import task of a LDIF file specifying that the import process should append to the existing database.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Append'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
- 'append' : 'TRUE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['ou=Departed,ou=People,dc=example,dc=com',
- 'uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks:Append Replace Existing
- #@TestID Append Replace Existing
- #@TestPurpose Verify an import task of a LDIF file specifying that an existing entry should be replaced when appending to an existing database.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Append Replace Existing'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Append.ldif' % STAGED_DATA_DIR,
- 'append' : 'TRUE',
- 'replaceExisting' : 'TRUE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['ou=Departed,ou=People,dc=example,dc=com',
- 'uid=fvinker,ou=Departed,ou=People,dc=example,dc=com',
- 'uid=brammage,ou=Departed,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Compressed
- #@TestID Compressed
- #@TestPurpose Verify an import task of a LDIF file specifying the data to import is compressed.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Compressed'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif.gz' % STAGED_DATA_DIR,
- 'isCompressed' : 'TRUE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Encrypted
- #@TestID Encrypted
- #@TestPurpose Verify an import task of a LDIF file specifying the data to import is encrypted.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Encrypted'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
- 'isEncrypted' : 'TRUE'
- }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <!-- This test should fail. -->
- <tcstatus result="'fail'"/>
- <message log="1" level="'Error'">
- 'Error: Known bug. Issue 839: Encrypted LDIF export is not implemented'
- </message>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Hashed Signed
- #@TestID Hashed Signed
- #@TestPurpose Verify an import task of a LDIF file specifying the data to import is hashed/signed.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <!-- Test Not Implemented. Feature not avaliable -->
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Rejects File
- #@TestID Rejects File
- #@TestPurpose Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is not overwritten.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Rejects File'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
- 'rejectsFile' : './rejects'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <!-- Should check there is a rejects file and the contents are correct -->
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Rejects File Overwrite
- #@TestID Rejects File Overwrite
- #@TestPurpose Verify an import task of a LDIF file specifying the a path to a file into which rejected entries may be written if they are not accepted during the import process, when the rejects file is overwritten.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Rejects File'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Example.ldif' % STAGED_DATA_DIR,
- 'rejectsFile' : './rejects',
- 'overwriteRejectsFile' : 'TRUE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=rhunt,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <!-- Should check there is a rejects file and the contents are correct -->
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Skip Schema Validation Accept
- #@TestID Skip Schema Validation Accept
- #@TestPurpose Verify an import task of a LDIF file containing invalided schema is accepted when skip schema validation is specified
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Skip Schema Validation Accept'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
- 'skipSchemaValidation' : 'TRUE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=dmiller,ou=People,dc=example,dc=com',
- 'uid=kwinters,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Skip Schema Validation Reject
- #@TestID Skip Schema Validation Reject
- #@TestPurpose Verify an import task of a LDIF file containing invalided schema is rejected when skip schema validation is not specified
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <testcase name="'Backend: Import Tasks: Skip Schema Validation Reject'">
-
- <sequence>
-
- <call function="'testCase_Preamble'"/>
-
- <call function="'importLdifTask'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
- 'taskID' : STAXCurrentTestcase,
- 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
- 'skipSchemaValidation' : 'FALSE'
- }
- </call>
-
- <call function="'checktestRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <call function="'checkImport'">
- { 'expectedEntries' : ['uid=dmiller,ou=People,dc=example,dc=com'],
- 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
- 'uid=kwinters,ou=People,dc=example,dc=com'],
- 'startDS' : 'no'
- }
- </call>
-
- <call function="'testCase_Postamble'"/>
-
- </sequence>
-
- </testcase>
-
- <!--- Test Case information
- #@TestMarker Backend Import Tasks Tests
- #@TestName Backend: Import Tasks: Error Codes
- #@TestID Error Codes
- #@TestPurpose Verify an import task fails with an error code.
- #@TestPreamble
- #@TestSteps
- #@TestPostamble
- #@TestResult
- -->
-
- <!-- Need to know what the error codes are -->
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Stop DS -->
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
+ <call function="'testCase_Postamble'"/>
+
</sequence>
-
- <!--- Block : Test Cases -->
- </block>
-
- </parallel>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Skip Schema Validation Reject
+ #@TestID Skip Schema Validation Reject
+ #@TestPurpose Verify an import task of a LDIF file containing invalided schema is rejected when skip schema validation is not specified
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <testcase name="'Backend: Import Tasks: Skip Schema Validation Reject'">
+
+ <sequence>
+
+ <call function="'testCase_Preamble'"/>
+
+ <call function="'importLdifTask'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD,
+ 'taskID' : STAXCurrentTestcase,
+ 'ldifFile' : '%s/backends/Schema.ldif' % STAGED_DATA_DIR,
+ 'skipSchemaValidation' : 'FALSE'
+ }
+ </call>
+
+ <call function="'checktestRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'checkImport'">
+ { 'expectedEntries' : ['uid=dmiller,ou=People,dc=example,dc=com'],
+ 'missingEntries' : ['uid=scarter,ou=People,dc=example,dc=com',
+ 'uid=kwinters,ou=People,dc=example,dc=com'],
+ 'startDS' : 'no'
+ }
+ </call>
+
+ <call function="'testCase_Postamble'"/>
+
+ </sequence>
+
+ </testcase>
+
+ <!--- Test Case information
+ #@TestMarker Backend Import Tasks Tests
+ #@TestName Backend: Import Tasks: Error Codes
+ #@TestID Error Codes
+ #@TestPurpose Verify an import task fails with an error code.
+ #@TestPreamble
+ #@TestSteps
+ #@TestPostamble
+ #@TestResult
+ -->
+
+ <!-- Need to know what the error codes are -->
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Stop DS -->
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
index cb97d63..b2c4732 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/core/core.xml
@@ -42,93 +42,68 @@
</script>
<call function="'testGroup_Preamble'"/>
-
- <parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
- <call function="'core_setup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_entry_cache.xml' % (TESTS_DIR)"/>
- <call function="'core_entry_cache'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_search_sizelimit.xml' % (TESTS_DIR)"/>
- <call function="'core_search_sizelimit'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_search_timelimit.xml' % (TESTS_DIR)"/>
- <call function="'core_search_timelimit'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_tf_filters.xml' % (TESTS_DIR)"/>
- <call function="'core_tf_filters'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/core/core_version_report.xml' % (TESTS_DIR)"/>
- <call function="'core_version_report'" />
-
- <!--- Stop DS -->
- <sequence>
-
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!-- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_setup.xml' % (TESTS_DIR)"/>
+ <call function="'core_setup'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_entry_cache.xml' % (TESTS_DIR)"/>
+ <call function="'core_entry_cache'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_search_sizelimit.xml' % (TESTS_DIR)"/>
+ <call function="'core_search_sizelimit'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_search_timelimit.xml' % (TESTS_DIR)"/>
+ <call function="'core_search_timelimit'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_tf_filters.xml' % (TESTS_DIR)"/>
+ <call function="'core_tf_filters'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/core/core_version_report.xml' % (TESTS_DIR)"/>
+ <call function="'core_version_report'" />
+
+ <!-- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testGroup_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
index 57c0ece..ec654ce 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -36,85 +36,61 @@
<block name="'quickstart'">
<sequence>
-
- <parallel>
+
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <message>
- 'Quickstart: Adding quickstart entries'
- </message>
-
- <call function="'addEntry'">
- { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
- 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
- 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
- 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
- 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % STAGED_DATA_DIR }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <message>
+ 'Quickstart: Adding quickstart entries'
+ </message>
+
+ <call function="'addEntry'">
+ { 'dsInstanceHost' : DIRECTORY_INSTANCE_HOST ,
+ 'dsInstancePort' : DIRECTORY_INSTANCE_PORT ,
+ 'dsInstanceDn' : DIRECTORY_INSTANCE_DN ,
+ 'dsInstancePswd' : DIRECTORY_INSTANCE_PSWD ,
+ 'entryToBeAdded' : '%s/quickstart/quickstart.ldif' % STAGED_DATA_DIR }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
index 9558513..b90ad95 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema.xml
@@ -43,76 +43,56 @@
<call function="'testGroup_Preamble'"/>
- <parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC , 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 , 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/schema/schema_setup.xml' % (TESTS_DIR)" />
- <call function="'schema_setup'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/schema/schema_rfc_tests.xml' % (TESTS_DIR)" />
- <call function="'schema_rfc_tests'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/schema/schema_dynamic.xml' % (TESTS_DIR)" />
- <call function="'schema-dynamic'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC , 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC , 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 , 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <!-- Call the test suites -->
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/schema/schema_setup.xml' % TESTS_DIR" />
+ <call function="'schema_setup'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/schema/schema_rfc_tests.xml' % TESTS_DIR" />
+ <call function="'schema_rfc_tests'" />
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/schema/schema_dynamic.xml' % TESTS_DIR" />
+ <call function="'schema-dynamic'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testGroup_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
index f2e311a..681f529 100644
--- a/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
@@ -348,6 +348,8 @@
<call function="'testCase_Postamble'"/>
</sequence>
</testcase>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
index 74e6714..10bc38b 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -43,83 +43,62 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/account_activation/security_setup_account_activation.xml' % (TESTS_DIR)"/>
- <call function="'setup_account_activation'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/account_activation/security_test_account.xml' % (TESTS_DIR)"/>
- <call function="'test_account'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/account_activation/security_account_expiration.xml' % (TESTS_DIR)"/>
- <call function="'account_expiration'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/account_activation/security_teardown_account_activation.xml' % (TESTS_DIR)"/>
- <call function="'teardown_account_activation'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/account_activation/security_setup_account_activation.xml' % (TESTS_DIR)"/>
+ <call function="'setup_account_activation'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/account_activation/security_test_account.xml' % (TESTS_DIR)"/>
+ <call function="'test_account'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/account_activation/security_account_expiration.xml' % (TESTS_DIR)"/>
+ <call function="'account_expiration'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/account_activation/security_teardown_account_activation.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_account_activation'" />
+
+ <!--- Stop DS -->
+
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
index e5c0f7b..ef293e0 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -43,100 +43,77 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
- <call function="'setup_auth_pwd_syntax'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_MD5_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_SHA256_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_SHA384_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_SHA512_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_SHA1_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml' % (TESTS_DIR)"/>
- <call function="'auth_pwd_syntax_def_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
- <call function="'teardown_auth_pwd_syntax'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
- </parallel>
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_setup_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
+ <call function="'setup_auth_pwd_syntax'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_MD5_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_MD5_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA256_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_SHA256_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA384_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_SHA384_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA512_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_SHA512_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_SHA1_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_SHA1_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax_def_policy.xml' % (TESTS_DIR)"/>
+ <call function="'auth_pwd_syntax_def_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/auth_pwd_syntax/security_teardown_auth_pwd_syntax.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_auth_pwd_syntax'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
index 3c5a48d..8a30e02 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -42,81 +42,58 @@
</script>
<call function="'testSuite_Preamble'"/>
-
- <parallel>
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'setup_bind_no_pwd'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
- <call function="'pwd_null'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
- <call function="'teardown_bind_no_pwd'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
- </parallel>
-
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/bind_no_pwd/security_setup_bind_no_pwd.xml' % (TESTS_DIR)"/>
+ <call function="'setup_bind_no_pwd'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/bind_no_pwd/security_pwd_null.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_null'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/bind_no_pwd/security_teardown_bind_no_pwd.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_bind_no_pwd'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
index 134f811..4aa6fe3 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -43,80 +43,56 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
- <call function="'setup_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
- <call function="'bob_jks'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
- <call function="'teardown_jks'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!-- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!-- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!-- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_setup_jks.xml' % (TESTS_DIR)"/>
+ <call function="'setup_jks'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_bob_jks.xml' % (TESTS_DIR)"/>
+ <call function="'bob_jks'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_jks'" />
+
+ <!-- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
index 08f4e9a..c30c5bf 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -42,82 +42,59 @@
</script>
<call function="'testSuite_Preamble'"/>
-
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'setup_pkcs12'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'bob_pkcs12'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pkcs12'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- <call function="'testSuite_Postamble'"/>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_setup_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pkcs12'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_bob_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'bob_pkcs12'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pkcs12/security_teardown_pkcs12.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pkcs12'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
index bb6b76d..0769915 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -43,119 +43,96 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'user_pwd_policy'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change_all_users'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'enable_max_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'disable_max_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
- <call function="'min_pwd_age'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml' % (TESTS_DIR)"/>
- <call function="'lockout_fail_cnt'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml' % (TESTS_DIR)"/>
- <call function="'mult_pwd_policies'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml' % (TESTS_DIR)"/>
- <call function="'preencoded_pwds'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml' % (TESTS_DIR)"/>
- <call function="'lockout_duration'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_last_login.xml' % (TESTS_DIR)"/>
- <call function="'last_login'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_policy'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_setup_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_user_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'user_pwd_policy'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_force_pwd_change.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_force_pwd_change_all_users.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change_all_users'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_enable_max_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'enable_max_pwd_age'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_disable_max_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'disable_max_pwd_age'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_min_pwd_age.xml' % (TESTS_DIR)"/>
+ <call function="'min_pwd_age'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_lockout_fail_cnt.xml' % (TESTS_DIR)"/>
+ <call function="'lockout_fail_cnt'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_mult_pwd_policies.xml' % (TESTS_DIR)"/>
+ <call function="'mult_pwd_policies'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_preencoded_pwds.xml' % (TESTS_DIR)"/>
+ <call function="'preencoded_pwds'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_lockout_duration.xml' % (TESTS_DIR)"/>
+ <call function="'lockout_duration'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_last_login.xml' % (TESTS_DIR)"/>
+ <call function="'last_login'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy/security_teardown_pwd_policy.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_policy'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
index df2f8eb..c25e193 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
@@ -42,72 +42,49 @@
</script>
<call function="'testSuite_Preamble'"/>
-
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
- <call function="'root_user_tests'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_policy_root/security_root_user_tests.xml' % (TESTS_DIR)"/>
+ <call function="'root_user_tests'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
index 770e420..2db095d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -42,121 +42,98 @@
</script>
<call function="'testSuite_Preamble'"/>
-
- <parallel>
-
- <block name="'Block DS Process Active'">
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_storage'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SHA'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA256'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA384'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SSHA512'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
- <call function="'pwd_MD5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
- <call function="'pwd_SMD5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
- <call function="'pwd_BASE64'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
- <call function="'pwd_CLEAR'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
- <call function="'multiple_schemes'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
- <call function="'deprecated_schemes'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_storage'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
-
+ <!-- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_setup_pwd_storage.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_storage'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SHA.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SHA'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA256.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA256'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA384.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA384'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SSHA512.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SSHA512'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_MD5.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_MD5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_SMD5.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_SMD5'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_BASE64.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_BASE64'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_pwd_CLEAR.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_CLEAR'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_multiple_schemes.xml' % (TESTS_DIR)"/>
+ <call function="'multiple_schemes'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_deprecated_schemes.xml' % (TESTS_DIR)"/>
+ <call function="'deprecated_schemes'" />
+
+ <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
+ file="'%s/testcases/security/pwd_storage/security_teardown_pwd_storage.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_storage'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
<call function="'testSuite_Postamble'"/>
</sequence>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
index d8c3b3b..96c5d31 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -43,83 +43,60 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_setup_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'setup_pwd_validator'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_pwd_length.xml' % (TESTS_DIR)"/>
- <call function="'pwd_length'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_skip_val_for_admins.xml' % (TESTS_DIR)"/>
- <call function="'skip_val_for_admins'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/pwd_validator/security_teardown_pwd_validator.xml' % (TESTS_DIR)"/>
- <call function="'teardown_pwd_validator'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_validator/security_setup_pwd_validator.xml' % (TESTS_DIR)"/>
+ <call function="'setup_pwd_validator'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_validator/security_pwd_length.xml' % (TESTS_DIR)"/>
+ <call function="'pwd_length'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_validator/security_skip_val_for_admins.xml' % (TESTS_DIR)"/>
+ <call function="'skip_val_for_admins'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/pwd_validator/security_teardown_pwd_validator.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_pwd_validator'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
index b29173d..c56d35d 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -43,91 +43,68 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
- <call function="'setup_sasl'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
- <call function="'sasl_anon'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
- <call function="'sasl_plain'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
- <call function="'sasl_cram-md5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
- <call function="'sasl_digest-md5'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
- <call function="'teardown_sasl'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
-
- </parallel>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_setup_sasl.xml' % (TESTS_DIR)"/>
+ <call function="'setup_sasl'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_sasl_anon.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_anon'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_sasl_plain.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_plain'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_sasl_cram-md5.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_cram-md5'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_sasl_digest-md5.xml' % (TESTS_DIR)"/>
+ <call function="'sasl_digest-md5'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/sasl/security_teardown_sasl.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_sasl'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
diff --git a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
index 1cebbeb..cca45d7 100755
--- a/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
+++ b/opendj-sdk/opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -39,83 +39,60 @@
<call function="'testSuite_Preamble'"/>
- <parallel>
-
- <block name="'Block DS Process Active'">
-
- <!--- Start DS -->
- <sequence>
- <message>
- 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <!--- Start DS -->
- <call function="'StartDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
-
- </sequence>
-
- <!--- End Block DS Process Active -->
- </block>
-
- <block name="'Block Clients'">
-
- <sequence>
-
- <!--- Check that DS started -->
- <call function="'isAlive'">
- { 'noOfLoops' : 5 ,
- 'noOfMilliSeconds' : 2000 }
- </call>
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'setup_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'bob_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'force_pwd_change_startTLS'" />
-
- <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
- file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
- <call function="'teardown_startTLS'" />
-
- <!--- Stop DS -->
- <sequence>
- <message>
- 'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
- </message>
-
- <call function="'StopDsWithScript'">
- { 'location' : STAF_REMOTE_HOSTNAME,
- 'dsHost' : DIRECTORY_INSTANCE_HOST,
- 'dsPort' : DIRECTORY_INSTANCE_PORT,
- 'dsBindDN' : DIRECTORY_INSTANCE_DN,
- 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
- </call>
-
- <call function="'checkRC'">
- { 'returncode' : RC ,
- 'result' : STAXResult }
- </call>
- </sequence>
-
- </sequence>
-
- <!--- End Block Clients -->
- </block>
+ <!--- Start DS -->
+ <message>
+ 'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
- </parallel>
+ <!--- Start DS -->
+ <call function="'StartDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
+
+ <!--- Check that DS started -->
+ <call function="'isAlive'">
+ { 'noOfLoops' : 5 ,
+ 'noOfMilliSeconds' : 2000 }
+ </call>
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/startTLS/security_setup_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'setup_startTLS'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/startTLS/security_bob_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'bob_startTLS'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/startTLS/security_force_pwd_change_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'force_pwd_change_startTLS'" />
+
+ <import machine="'%s' % STAF_LOCAL_HOSTNAME"
+ file="'%s/testcases/security/startTLS/security_teardown_startTLS.xml' % (TESTS_DIR)"/>
+ <call function="'teardown_startTLS'" />
+
+ <!--- Stop DS -->
+ <message>
+ 'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
+ </message>
+
+ <call function="'StopDsWithScript'">
+ { 'location' : STAF_REMOTE_HOSTNAME,
+ 'dsHost' : DIRECTORY_INSTANCE_HOST,
+ 'dsPort' : DIRECTORY_INSTANCE_PORT,
+ 'dsBindDN' : DIRECTORY_INSTANCE_DN,
+ 'dsBindPwd' : DIRECTORY_INSTANCE_PSWD }
+ </call>
+
+ <call function="'checkRC'">
+ { 'returncode' : RC ,
+ 'result' : STAXResult }
+ </call>
<call function="'testSuite_Postamble'"/>
--
Gitblit v1.10.0