Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

 opends/tests/functional-tests/testcases/security/pkcs12/security_pkcs12.xml

@@ -33,88 +33,96 @@

    <sequence>

      <script>
        CurrentTestPath['suite']='pkcs12'
      </script>
            
      <call function="'testSuite_Preamble'"/>

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

      </parallel>

    
      </block>
    
    </sequence>

  </function>