Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

 opends/tests/functional-tests/testcases/aci/aci.xml

@@ -31,99 +31,107 @@

  <function name="main_aci">

      <sequence>
    <sequence>

        <script>
          CurrentTestPath['group']='aci'
        </script>
      <block name="'aci'">
      
        <call function="'testGroup_Preamble'"/>
        <sequence>
    
          <script>
            CurrentTestPath['group']='aci'
          </script>
      
          <call function="'testGroup_Preamble'"/>
          
          <parallel>
                  
            <block name="'Block DS Process Active'">
        
        <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)
                   'Start DS to run 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 }
        
                <!--- Start DS -->
                <call function="'StartDsWithScript'">
                 { 'location'  : STAF_REMOTE_HOSTNAME }
                </call>
      
        
                <call function="'checkRC'">
                    { 'returncode' : RC ,
                      'result'     : STAXResult }
                </call>
              </sequence>
      
              </sequence>
      
              <!--- End Block Clients -->
              </block>
    
          </parallel>

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

  </function>