Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

 opends/tests/functional-tests/testcases/security/sasl/security_sasl.xml

@@ -33,100 +33,108 @@

    <sequence>

      <script>
        CurrentTestPath['suite']='sasl'
      </script>
      <block name="'sasl'">
      
      <call function="'testSuite_Preamble'"/>
        
      <parallel>
        <sequence>
  
          <script>
            CurrentTestPath['suite']=STAXCurrentBlock
          </script>
      
        <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>

      <call function="'testSuite_Postamble'"/>
          <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>
    
          <call function="'testSuite_Postamble'"/>
            
        </sequence>
    
      </block>
    
    </sequence>

  </function>