Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

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

@@ -33,85 +33,93 @@

    <sequence>

      <parallel>
      <block name="'quickstart'">
      
        <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>
     
            <message>
               'Quickstart: Adding quickstart entries'
            </message>
        <sequence>

            <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>
          <parallel>
          
         </sequence>
            <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>
         
                <message>
                   'Quickstart: Adding quickstart entries'
                </message>
    
          </sequence>
                <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>
    
        <!--- End Block Clients -->
        </block>

      </parallel>
                <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>
      
        </sequence>
    
      </block>
    
    </sequence>

  </function>