Issue 1354 use block element for test groups and suites

gary_williams

13.18.2007 50f8a165bf3b68795f4f8d424286788c1abb2a13

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

@@ -31,56 +31,64 @@

  <function name="main_backends">

      <sequence>
    <sequence>

        <script>
          CurrentTestPath['group']='backends'
        </script>
      <block name="'backends'">
      
        <call function="'testGroup_Preamble'"/>
              
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
        <call function="'main_import'" />

        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
        <call function="'main_import-tasks'" />
             
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/backendsetup.xml' % (TESTS_DIR)"/>
        <call function="'main_backend-setup'" />

        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
        <call function="'main_backup-tasks'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
        <call function="'main_backup'" />
 
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
        <call function="'main_restore-tasks'" />
        <sequence>
    
          <script>
            CurrentTestPath['group']='backends'
          </script>
      
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
        <call function="'main_restore'" />
              
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
        <call function="'main_export-tasks'" />
          <call function="'testGroup_Preamble'"/>
                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/import.xml' % (TESTS_DIR)"/>
          <call function="'main_import'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/import-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_import-tasks'" />
               
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/backendsetup.xml' % (TESTS_DIR)"/>
          <call function="'main_backend-setup'" />
  
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/backup-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_backup-tasks'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/backup.xml' % (TESTS_DIR)"/>
          <call function="'main_backup'" />
   
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/restore-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_restore-tasks'" />
        
        <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
          file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
        <call function="'main_export'" />
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/restore.xml' % (TESTS_DIR)"/>
          <call function="'main_restore'" />
                
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/export-tasks.xml' % (TESTS_DIR)"/>
          <call function="'main_export-tasks'" />
          
          <import machine="'%s' % (STAF_LOCAL_HOSTNAME)"
            file="'%s/testcases/backends/export.xml' % (TESTS_DIR)"/>
          <call function="'main_export'" />
          
          <!-- Set the server backup the way it was before the backend tests -->
          <call function="'main_quickstart'" />
          
          <call function="'testGroup_Postamble'"/>
        
        <!-- Set the server backup the way it was before the backend tests -->
        <call function="'main_quickstart'" />
        
        <call function="'testGroup_Postamble'"/>
        
      </sequence>
        </sequence>
      
      </block>
      
    </sequence>

  </function>