Remove cut and paste error in functional tests cleanup

Gary Williams

22.23.2012 949a27fc68cd2dc260623506d1ab13473d6fa3b9

Remove cut and paste error in functional tests cleanup

 opends/tests/staf-tests/functional-tests/testcases/backends/backup-tasks/backup-tasks.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_backup-tasks"/>
@@ -112,7 +113,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

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

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009-2010 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_dbparams"/>
@@ -133,7 +134,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/backends/export-tasks/export-tasks.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_export-tasks"/>
@@ -131,7 +132,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
                <catch exception="'STAFException'">

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

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_export"/>
@@ -142,7 +143,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/backends/import-tasks/import-tasks.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_import-tasks"/>
@@ -137,7 +138,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

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

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_import"/>
@@ -138,7 +139,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/backends/restore-tasks/restore-tasks.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2009 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_restore-tasks"/>
@@ -111,7 +112,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/core/psearch/core_psearch.xml

@@ -24,6 +24,7 @@
 ! CDDL HEADER END
 !
 !      Copyright 2010 Sun Microsystems, Inc.
 !      Portions Copyright 2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="core_psearch"/>
@@ -117,7 +118,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
                <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_batch-mode/dsconfig_batch-mode.xml

@@ -112,7 +112,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_get/dsconfig_get.xml

@@ -138,7 +138,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }

 opends/tests/staf-tests/functional-tests/testcases/dsconfig/dsconfig_list/dsconfig_list.xml

@@ -130,7 +130,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'">
                  { 'friendlyName'  : __label }

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

@@ -123,7 +123,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/snmp/basic/snmp_basic.xml

@@ -161,7 +161,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <message>'No Test Suite Cleanup'</message>
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/snmp/traps/snmp_traps.xml

@@ -126,7 +126,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <message>'No Test Suite Cleanup'</message>
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/snmp/v1/snmp_v1.xml

@@ -127,7 +127,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <message>'No Test Suite Cleanup'</message>
              <catch exception="'STAFException'">

 opends/tests/staf-tests/functional-tests/testcases/snmp/v2c/snmp_v2c.xml

@@ -127,7 +127,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <message>'No Test Suite Cleanup'</message>
              <catch exception="'STAFException'">

 opends/tests/staf-tests/stress-tests/testcases/operations/basic/operations_basic.xml

@@ -23,7 +23,7 @@
 !
 ! CDDL HEADER END
 !
 !      Copyright 2011 ForgeRock AS.
 !      Copyright 2011-2012 ForgeRock AS.
 ! -->
<stax>
  <defaultcall function="main_operations_basic"/>
@@ -116,7 +116,7 @@
          <finally>
            <sequence>
              <!-- Test Suite Cleanup -->
              <message>'Finally: Global Schema Cleanup.'</message>
              <message>'Finally: Global Cleanup.'</message>
              <try>
                <call function="'common_cleanup'" />
              <catch exception="'STAFException'">