mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

gary_williams
15.09.2007 a1c7cf8a7f806d69731f6ee3def830e022454882
Issue 1365 remove parallel script for opends not starting in background
18 files modified
544 ■■■■ changed files
opends/tests/functional-tests/testcases/aci/aci.xml 23 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci_targetattr.xml 4 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/backends/import-tasks.xml 28 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/core/core.xml 29 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/quickstart/quickstart.xml 24 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/schema/schema.xml 42 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/schema/schema_dynamic.xml 2 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml 35 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml 43 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml 33 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/jks/security_jks.xml 42 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml 23 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml 53 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml 29 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml 25 ●●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml 35 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml 39 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml 35 ●●●● patch | view | raw | blame | history
opends/tests/functional-tests/testcases/aci/aci.xml
@@ -43,12 +43,7 @@
      
          <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>
@@ -63,15 +58,6 @@
                      'result'     : STAXResult }
                </call>
        
              </sequence>
             <!--- End Block DS Process Active -->
             </block>
             <block name="'Block Clients'">
              <sequence>
                <!--- Check that DS started -->
                <call function="'isAlive'">
                  { 'noOfLoops'        : 5 ,
@@ -99,7 +85,6 @@
                <call function="'aci_teardown'" />
        
                <!--- Stop DS -->
                <sequence>
                  <message>
                     'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                  </message>
@@ -116,14 +101,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
                </sequence>
                <!--- End Block Clients -->
                </block>
            </parallel>
  
          <call function="'testGroup_Postamble'"/>
        
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
@@ -1328,6 +1330,8 @@
            
          </testcase>
         <call function="'testSuite_Postamble'"/>
        </sequence>
      
      </block>
opends/tests/functional-tests/testcases/backends/import-tasks.xml
@@ -44,15 +44,9 @@
          
          <call function="'testSuite_Preamble'"/>
        
          <parallel>
            <!--- Block : DS -->
            <block name="'Block DS Process Active'">
             <!--- Start DS -->
             <sequence>
               <message>
                  'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
            'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
               </message>
      
              <call function="'StartDsWithScript'">
@@ -64,16 +58,6 @@
                     'result'     : STAXResult }
               </call>
     
             </sequence>
            <!--- Block : DS -->
            </block>
            <!--- Block : Test Cases -->
            <block name="'Block Test Cases Active'">
              <sequence>
                <!--- Check that DS started -->
                <call function="'isAlive'">
                  { 'noOfLoops'        : 5 ,
@@ -1374,7 +1358,6 @@
                <!-- Need to know what the error codes are -->
                
                <!--- Stop DS -->
                 <sequence>
                   <message>
                      'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                   </message>
@@ -1393,15 +1376,6 @@
                         'result'     : STAXResult }
                   </call>
         
                 </sequence>
              </sequence>
            <!--- Block : Test Cases -->
            </block>
          </parallel>
          <call function="'testSuite_Postamble'"/>
        </sequence>
opends/tests/functional-tests/testcases/core/core.xml
@@ -43,12 +43,7 @@
            
          <call function="'testGroup_Preamble'"/>
    
          <parallel>
          <block name="'Block DS Process Active'">
            <!--- Start DS -->
            <sequence>
          <!-- Start DS -->
              <message>
                 'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
              </message>
@@ -62,15 +57,6 @@
                    'result'     : STAXResult }
              </call>
      
            </sequence>
           <!--- End Block DS Process Active -->
           </block>
           <block name="'Block Clients'">
            <sequence>
              <!--- Check that DS started -->
              <call function="'isAlive'">
                { 'noOfLoops'        : 5 ,
@@ -101,9 +87,7 @@
                file="'%s/testcases/core/core_version_report.xml' % (TESTS_DIR)"/>
              <call function="'core_version_report'" />
              
              <!--- Stop DS -->
              <sequence>
          <!-- Stop DS -->
                <message>
                   'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                </message>
@@ -121,15 +105,6 @@
                      'result'     : STAXResult }
                </call>
      
              </sequence>
            </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
          <call function="'testGroup_Postamble'"/>
      
        </sequence>
opends/tests/functional-tests/testcases/quickstart/quickstart.xml
@@ -37,12 +37,7 @@
      
        <sequence>
          <parallel>
            <block name="'Block DS Process Active'">
              <!--- Start DS -->
              <sequence>
                 <message>
                    'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
                 </message>
@@ -56,15 +51,6 @@
                       'result'     : STAXResult }
                 </call>
          
               </sequence>
             <!--- End Block DS Process Active -->
             </block>
             <block name="'Block Clients'">
              <sequence>
                <!--- Check that DS started -->
                <call function="'isAlive'">
                  { 'noOfLoops'        : 5 ,
@@ -89,7 +75,6 @@
                </call>
        
                <!--- Stop DS -->
                <sequence>
                  <message>
                     'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                  </message>
@@ -109,15 +94,6 @@
              
                </sequence>
        
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
        </sequence>
      </block>
    
    </sequence>
opends/tests/functional-tests/testcases/schema/schema.xml
@@ -43,13 +43,9 @@
          
          <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)
            'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
    
                <!--- Start DS -->
@@ -61,36 +57,27 @@
                  { '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 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)" />
          <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)" />
          <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)
            'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
    
                  <call function="'StopDsWithScript'">
@@ -102,16 +89,9 @@
                  </call>
    
                  <call function="'checkRC'">
                    { 'returncode' : RC , 'result' : STAXResult }
            { 'returncode' : RC ,
              'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
              <!--- End Block Clients -->
            </block>
          </parallel>
          
          <call function="'testGroup_Postamble'"/>
opends/tests/functional-tests/testcases/schema/schema_dynamic.xml
@@ -349,6 +349,8 @@
          </sequence>
        </testcase>
      
        <call function="'testSuite_Postamble'"/>
        </sequence>
    
      </block>
opends/tests/functional-tests/testcases/security/account_activation/security_account_activation.xml
@@ -43,14 +43,9 @@
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,41 +58,32 @@
                      '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)"
          <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)"
          <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)"
          <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)"
          <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)
               'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -112,14 +98,7 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
        
                </sequence>
                <!--- End Block Clients -->
                </block>
            </parallel>
  
          <call function="'testSuite_Postamble'"/>
        
opends/tests/functional-tests/testcases/security/auth_pwd_syntax/security_auth_pwd_syntax.xml
@@ -43,14 +43,9 @@
        
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,57 +58,47 @@
                      '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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -128,14 +113,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
  
          <call function="'testSuite_Postamble'"/>
        
opends/tests/functional-tests/testcases/security/bind_no_pwd/security_bind_no_pwd.xml
@@ -43,14 +43,9 @@
              
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,37 +58,27 @@
                      '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)"
          <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)"
          <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)"
          <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
      
                  <call function="'StopDsWithScript'">
@@ -108,14 +93,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
    
          <call function="'testSuite_Postamble'"/>
        
opends/tests/functional-tests/testcases/security/jks/security_jks.xml
@@ -43,17 +43,12 @@
       
          <call function="'testSuite_Preamble'"/>
    
          <parallel>
            <block name="'Block DS Process Active'">
              <!--- Start DS -->
              <sequence>
          <!-- Start DS -->
                <message>
                   'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
          <!-- Start DS -->
                <call function="'StartDsWithScript'">
                 { 'location'  : STAF_REMOTE_HOSTNAME }
                </call>
@@ -63,37 +58,27 @@
                      'result'     : STAXResult }
                </call>
        
              </sequence>
             <!--- End Block DS Process Active -->
             </block>
             <block name="'Block Clients'">
              <sequence>
                <!--- Check that DS started -->
          <!-- Check that DS started -->
                <call function="'isAlive'">
                  { 'noOfLoops'        : 5 ,
                    'noOfMilliSeconds' : 2000 }
                </call>
        
                <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          <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)"
          <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)"
          <import machine="'%s' % STAF_LOCAL_HOSTNAME"
                  file="'%s/testcases/security/jks/security_teardown_jks.xml' % (TESTS_DIR)"/>
                <call function="'teardown_jks'" />
        
                <!--- Stop DS -->
                <sequence>
          <!-- Stop DS -->
                  <message>
                     'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -109,15 +94,6 @@
                        'result'     : STAXResult }
                  </call>
                  
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
          <call function="'testSuite_Postamble'"/>
        </sequence>
opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml
@@ -43,12 +43,7 @@
            
          <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>
@@ -63,15 +58,6 @@
                      'result'     : STAXResult }
                </call>
        
              </sequence>
            <!--- End Block DS Process Active -->
            </block>
            <block name="'Block Clients'">
            <sequence>
              <!--- Check that DS started -->
              <call function="'isAlive'">
                { 'noOfLoops'        : 5 ,
@@ -91,7 +77,6 @@
              <call function="'teardown_pkcs12'" />
      
              <!--- Stop DS -->
              <sequence>
                <message>
                   'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                </message>
@@ -108,19 +93,11 @@
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              </sequence>
      
              <call function="'testSuite_Postamble'"/>
      
            </sequence>
      
            <!--- End Block Clients -->
            </block>
          </parallel>
        </sequence>
      </block>
    
    </sequence>
opends/tests/functional-tests/testcases/security/pwd_policy/security_pwd_policy.xml
@@ -43,14 +43,9 @@
      
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,77 +58,67 @@
                      '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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -148,14 +133,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
    
          <call function="'testSuite_Postamble'"/>
    
opends/tests/functional-tests/testcases/security/pwd_policy_root/security_pwd_policy_root.xml
@@ -43,14 +43,9 @@
      
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,29 +58,19 @@
                      '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)"
          <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -100,14 +85,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
            </parallel>
    
          <call function="'testSuite_Postamble'"/>
    
opends/tests/functional-tests/testcases/security/pwd_storage/security_pwd_storage.xml
@@ -43,12 +43,7 @@
          <call function="'testSuite_Preamble'"/>
                  
          <parallel>
            <block name="'Block DS Process Active'">
              <!--- Start DS -->
              <sequence>
          <!-- Start DS -->
                <message>
                   'Start DS to run on port %s' % (DIRECTORY_INSTANCE_PORT)
                </message>
@@ -63,15 +58,6 @@
                      'result'     : STAXResult }
                </call>
        
              </sequence>
             <!--- End Block DS Process Active -->
             </block>
             <block name="'Block Clients'">
              <sequence>
                <!--- Check that DS started -->
                <call function="'isAlive'">
                  { 'noOfLoops'        : 5 ,
@@ -131,7 +117,6 @@
                <call function="'teardown_pwd_storage'" />
        
                <!--- Stop DS -->
                <sequence>
                  <message>
                     'Stop DS running on port %s' % (DIRECTORY_INSTANCE_PORT)
                  </message>
@@ -148,14 +133,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
    
          <call function="'testSuite_Postamble'"/>
    
opends/tests/functional-tests/testcases/security/pwd_validator/security_pwd_validator.xml
@@ -43,14 +43,9 @@
    
        <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)
           'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
              </message>
      
              <!--- Start DS -->
@@ -63,41 +58,31 @@
                    '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)"
        <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)"
        <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)"
        <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)"
        <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
      
                <call function="'StopDsWithScript'">
@@ -112,14 +97,6 @@
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              </sequence>
            </sequence>
            <!--- End Block Clients -->
            </block>
          </parallel>
    
          <call function="'testSuite_Postamble'"/>
          
opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml
@@ -43,14 +43,9 @@
      
          <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)
             'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
                </message>
        
                <!--- Start DS -->
@@ -63,49 +58,39 @@
                      '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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)"
          <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)
             'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
                  </message>
        
                  <call function="'StopDsWithScript'">
@@ -120,14 +105,6 @@
                      { 'returncode' : RC ,
                        'result'     : STAXResult }
                  </call>
                </sequence>
              </sequence>
              <!--- End Block Clients -->
              </block>
            </parallel>
    
          <call function="'testSuite_Postamble'"/>
            
opends/tests/functional-tests/testcases/security/startTLS/security_startTLS.xml
@@ -39,14 +39,9 @@
      
      <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)
         'Start DS to run on port %s' % DIRECTORY_INSTANCE_PORT
            </message>
    
            <!--- Start DS -->
@@ -59,41 +54,31 @@
                  '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)"
      <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)"
      <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)"
      <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)"
      <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)
         'Stop DS running on port %s' % DIRECTORY_INSTANCE_PORT
              </message>
    
              <call function="'StopDsWithScript'">
@@ -108,14 +93,6 @@
                  { 'returncode' : RC ,
                    'result'     : STAXResult }
              </call>
            </sequence>
          </sequence>
        <!--- End Block Clients -->
        </block>
      </parallel>
      <call function="'testSuite_Postamble'"/>