Improve setup/cleanup of fractional replication functional tests

Gary Williams

29.41.2012 aa6c69c4846d7c74c24dd9239555904ed169f51e

Improve setup/cleanup of fractional replication functional tests

 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/basic.xml

@@ -126,7 +126,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <sequence>
                  <!-- fractional-replication cleanup -->

 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_cleanup.xml

@@ -44,7 +44,12 @@

      <block name="'fractional-replication-cleanup'">

        <testcase name="getTestCaseName('Fractional Repl Cleanup')">

          <try>
          
        <sequence>
              <call function="'testCase_Preamble'"/>

          <!-- Stop the servers in the topology -->
          <call function="'stopServers'">
@@ -116,8 +121,27 @@
              'result'     : STAXResult }
          </call>

              <tcstatus result="'pass'"></tcstatus>                      

        </sequence>

            <catch exception="'STAXException'" typevar="eType" var="eInfo">
              <sequence>
              <message log="1" level="'fatal'">
                '%s: Failed to cleanup. eInfo(%s)' % (eType,eInfo)
              </message>
              <throw exception="'STAFException.TestSuite.CleanupException'" />
              </sequence>
            </catch>
            <finally>
              <!-- Test Case postamble -->
              <call function="'testCase_Postamble'"/>
            </finally>
  
          </try>        

        </testcase>

      </block>

    </sequence>

 opends/tests/staf-tests/functional-tests/testcases/fractional-replication/fractional-replication_setup.xml

@@ -24,7 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2011 ForgeRock AS.
 !      Portions Copyright 2011-2012 ForgeRock AS.
 ! -->
<stax>

@@ -81,9 +81,14 @@

    <sequence>

      <block name="'replication-setup'">
      <block name="'fractional-replication-startup'">

        <testcase name="getTestCaseName('Fractional Repl Setup')">

          <try>

        <sequence>
              <call function="'testCase_Preamble'"/>

          <message>
             'Create DS topology as described in %s' % topologyFile
@@ -586,8 +591,27 @@
            </paralleliterate>
          </if>

              <tcstatus result="'pass'"></tcstatus>                      

        </sequence>

            <catch exception="'STAXException'" typevar="eType" var="eInfo">
              <sequence>
              <message log="1" level="'fatal'">
                '%s: Failed to cleanup. eInfo(%s)' % (eType,eInfo)
              </message>
              <throw exception="'STAFException.TestSuite.CleanupException'" />
              </sequence>
            </catch>
            <finally>
              <!-- Test Case postamble -->
              <call function="'testCase_Postamble'"/>
            </finally>
  
          </try>        

        </testcase>

      </block>

    </sequence>