[jboss-cvs] JBossAS SVN: r64228 - trunk/testsuite.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Jul 23 22:46:15 EDT 2007


Author: bstansberry at jboss.com
Date: 2007-07-23 22:46:15 -0400 (Mon, 23 Jul 2007)
New Revision: 64228

Modified:
   trunk/testsuite/build.xml
Log:
[JBAS-4554] Extract clustering stuff from testsuite/build.xml into imports/config/tests-clustering.xml

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2007-07-24 02:44:24 UTC (rev 64227)
+++ trunk/testsuite/build.xml	2007-07-24 02:46:15 UTC (rev 64228)
@@ -17,6 +17,9 @@
          xmlns:server="http://jboss.org/ns/test/ant/server">
    <import file="../tools/etc/buildmagic/build-common.xml"/>
 
+   <!-- Tests requiring separate server configurations -->
+   <import file="imports/config/configs.xml"/>
+
    <!-- ======================================================== -->
    <!-- Initialization                                           -->
    <!-- ======================================================== -->
@@ -583,8 +586,10 @@
    </macrodef>
 
    <!-- patternsets for specialized configs -->
-   <patternset id="apache_tomcat.cluster.includes">
-     <include name="org/jboss/test/cluster/apache_tomcat/*TestCase.class"/>
+   
+   <!-- Make the "test" system property a patternset -->
+   <patternset id="one.test.includes">
+      <include name="${test}"/>
    </patternset>
    <patternset id="binding-manager.includes">
      <include name="org/jboss/test/binding/*TestCase.class"/>
@@ -592,57 +597,6 @@
    <patternset id="binding-manager.excludes">
      <exclude name="org/jboss/test/binding/*TestCase.class"/>
    </patternset>
-   <!-- patternsets for that require clustering to be enabled -->
-  <patternset id="cluster.field.includes">
-    <include name="org/jboss/test/cluster/test/*FieldBased*TestCase.class"/>
-    <include name="org/jboss/test/cluster/test/StateTransferTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/UndeployFieldTestCase.class"/>
-  </patternset>
-  <patternset id="cluster.http.includes">
-    <!-- TODO move these into their own dir so we can handle this easily -->
-    <include name="org/jboss/test/cluster/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/CrossServerCalls*"/>
-    <exclude name="org/jboss/test/cluster/test/DistributedState*"/>
-    <exclude name="org/jboss/test/cluster/test/DRM*"/>
-    <exclude name="org/jboss/test/cluster/test/RPC*"/>
-    <exclude name="org/jboss/test/cluster/test/FamilyCluster*"/>
-    <exclude name="org/jboss/test/cluster/test/HAJndi*"/>
-    <exclude name="org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.class"/>
-    <!-- Problem tests -->
-    <exclude name="org/jboss/test/cluster/test/*ConcurrentTestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/FormAuthFailoverTestCase.class"/>
-    <!-- Exclude the FIELD granularity tests, as they require a different config -->
-    <exclude name="org/jboss/test/cluster/test/*FieldBased*TestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/StateTransferTestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/UndeployFieldTestCase.class"/>
-  </patternset>
-  <patternset id="cluster.http.jk.includes">
-    <include name="org/jboss/test/cluster/web/jk/test/*TestCase.class"/>
-  </patternset>
-  <patternset id="cluster.non.http.includes">
-    <include name="org/jboss/test/cluster/test/CrossServerCallsUnitTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/DistributedStateTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/DRMTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/RPCTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/FamilyClusterInfoUnitTestCase.class"/>
-    <include name="org/jboss/test/cluster/test/HAJndiTestCase.class"/>
-    <include name="org/jboss/test/cluster/partition/test/*TestCase.class"/>
-    <include name="org/jboss/test/cluster/jmx/test/*TestCase.class"/>
-    <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/>
-    <include name="org/jboss/test/ha/farm/test/*TestCase.class"/>
-    <include name="org/jboss/test/cluster/test/HASingletonElectionPolicyTestCase.class"/>
-  </patternset>
-   <patternset id="cluster.excludes">
-    <exclude name="org/jboss/test/cluster/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/cluster/test/web/jk/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/cluster/partition/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/cluster/jmx/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/testbeancluster/test/*TestCase.class"/>
-    <exclude name="org/jboss/test/ha/farm/test/*TestCase.class" />
-   </patternset>
-   <patternset id="one.test.includes">
-      <include name="${test}"/>
-   </patternset>
    <!-- The compatibility tests need extra memory -->
    <patternset id="compatibility.includes">
      <include name="org/jboss/test/compatibility/test/*TestCase.class"/>
@@ -657,10 +611,6 @@
    <patternset id="deployment-service.excludes">
       <exclude name="org/jboss/test/deployment/test/*TestCase.class"/>
    </patternset>
-   <patternset id="ha.includes">
-     <include name="org/jboss/test/ha/jmx/test/*TestCase.class"/>
-     <include name="org/jboss/test/ha/singleton/test/*TestCase.class"/>
-   </patternset>
    <!-- Tests needing IIOP setup -->
    <patternset id="iiop.includes">
       <include name="org/jboss/test/*iiop/test/*TestCase.class"/>
@@ -948,246 +898,6 @@
       <server:stop name="all"/>
    </target>
 
-   <target name="tests-apache-tomcat-clustering"
-      description="Execute clustering tests requiring an apache load balanced two TC nodes.">
-      <echo message="Will read config info from local.propeties file in testsuite dir"/>
-      <!-- Definition of apache is in imports/server-config.xml -->
-      <apache location="${apache.location}" action-type="start"/>
-      <create-cluster-node conf="node0"/>
-      <server:start name="node0" />
-      <create-cluster-node conf="node1"/>
-      <server:start name="node1"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-
-      <!-- Need a custom condition that queries for the node membership == 2 -->
-      <echo message="Going to call target tests-clustering-unit"/>
-
-      <antcall target="tests-clustering-unit">
-         <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/>
-         <param name="jboss-junit-configuration" value="Tomcat Clustering"/>
-      </antcall>
-      <server:stop name="node0"/>
-      <server:stop name="node1"/>
-      <apache location="${apache.location}" action-type="stop"/>
-   </target>
-
-    <!-- Tests for the ha stuff Ivelin wrote-->
-    <target name="tests-ha" description="Execute ha tests.">
-      <echo message="Going to call target tests-ha-unit"/>
-      <antcall target="tests-ha-unit"></antcall>
-   </target>
-
-  <!-- Run all clustering tests with two JGroups stacks (UDP and TCP)-->
-  <target name="tests-clustering-all-stacks"
-    description="Execute clustering tests requiring two nodes.">
-    <!-- Test the default UDP stack -->
-    <antcall target="tests-clustering">
-      <param name="jboss-junit-configuration" value="udp"/>
-    </antcall>
-    <!-- Test a TCP stack.-->
-    <antcall target="tests-clustering">
-      <param name="jboss-junit-configuration" value="tcp"/>
-    </antcall>
-    <!-- Test a TCP_NIO stack.-->
-    <antcall target="tests-clustering">
-      <param name="jboss-junit-configuration" value="tcp_nio"/>
-    </antcall>
-  </target>
-
-  <!-- Depending on the value of the ${jboss-junit-configuration} variable, uses different JGroups stacks -->
-  <target name="tests-clustering"
-    description="Execute clustering tests requiring two nodes.">
-
-    <!-- If jboss-junit-configuration wasn't passed in, set it now -->
-    <property name="jboss-junit-configuration" value="udp"/>
-
-    <antcall target="tests-clustering-configure" inheritRefs="true"/>
-
-    <server:start name="cluster-${jboss-junit-configuration}-0"/>
-    <server:start name="cluster-${jboss-junit-configuration}-1"/>
-
-    <echo message="Going to call target tests-clustering-unit for non-HTTP tests"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.non.http.includes"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-    <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, with BR)"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.http.includes"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-    <server:stop name="cluster-${jboss-junit-configuration}-0"/>
-    <server:stop name="cluster-${jboss-junit-configuration}-1"/>
-
-    <sleep seconds="4"/>
-
-
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, with BR)"/>
-
-    <antcall target="tests-clustering-field-configure" inheritRefs="true"/>
-
-    <server:start name="cluster-field-${jboss-junit-configuration}-0"/>
-    <server:start name="cluster-field-${jboss-junit-configuration}-1"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.field.includes"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-    <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
-    <server:stop name="cluster-field-${jboss-junit-configuration}-1"/>
-
-    <sleep seconds="4"/>
-
-    <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
-
-    <antcall target="tests-clustering-sync-configure"/>
-
-    <server:start name="cluster-${jboss-junit-configuration}-SYNC-0"/>
-    <server:start name="cluster-${jboss-junit-configuration}-SYNC-1"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.http.jk.includes"/>
-      <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
-    </antcall>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.http.includes"/>
-      <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
-    </antcall>
-
-    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-0"/>
-    <server:stop name="cluster-${jboss-junit-configuration}-SYNC-1"/>
-
-    <sleep seconds="4"/>
-
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, with BR)"/>
-
-    <antcall target="tests-clustering-field-sync-configure"/>
-
-    <server:start name="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <server:start name="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.field.includes"/>
-      <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-    </antcall>
-
-    <server:stop name="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <server:stop name="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-
-    <sleep seconds="4"/>
-
-    <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
-
-    <antcall target="tests-clustering-total-configure"/>
-
-    <server:start name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
-    <server:start name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.http.includes"/>
-      <param name="jboss-junit-configuration" value="BuddyReplDisabled-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-TOTAL-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-TOTAL-1"/>
-    </antcall>
-
-    <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-0"/>
-    <server:stop name="cluster-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <sleep seconds="4"/>
-
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, no BR)"/>
-
-    <antcall target="tests-clustering-field-total-configure"/>
-
-    <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
-    <server:start name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="cluster.field.includes"/>
-      <param name="jboss-junit-configuration" value="BuddyReplDisabled-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
-    </antcall>
-
-    <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
-    <server:stop name="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
-
-  </target>
-
-  <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-0"/>
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-1"/>
-  </target>
-
-  <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-0"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-1"/>
-  </target>
-
-  <target name="tests-clustering-sync-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-0"/>
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-SYNC-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
-    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
-    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
-  </target>
-
-  <target name="tests-clustering-field-sync-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-0" useBuddyRepl="true"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-SYNC-1" useBuddyRepl="true"/>
-  </target>
-
-  <target name="tests-clustering-total-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-TOTAL-0"/>
-    <create-cluster-node conf="cluster-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/TOTAL"/>
-    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-TOTAL-0" useBuddyRepl="false"/>
-    <http-cluster-node-config-change conf="cluster-${jboss-junit-configuration}-TOTAL-1" useBuddyRepl="false"/>
-  </target>
-
-  <target name="tests-clustering-field-total-configure" unless="${tests.clustering.skip.startup}">
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
-    <create-cluster-node conf="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-0"/>
-    <http-cluster-field-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-1"/>
-
-    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/TOTAL"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-0" useBuddyRepl="false"/>
-    <http-cluster-node-config-change conf="cluster-field-${jboss-junit-configuration}-TOTAL-1" useBuddyRepl="false"/>
-  </target>
-
    <target name="tests-profileservice" description="Tests with the full featured profile service">
       <create-profileservice-config baseconf="all" conf="profileservice"/>
       <server:start name="profileservice"/>
@@ -2105,119 +1815,7 @@
       </junit>
    </target>
 
-   <target name="tests-clustering-unit">
-      <mkdir dir="${build.reports}"/>
-      <mkdir dir="${build.testlog}"/>
-      <junit dir="${module.output}"
-         printsummary="${junit.printsummary}"
-         haltonerror="${junit.haltonerror}"
-         haltonfailure="${junit.haltonfailure}"
-         fork="${junit.fork}"
-         timeout="${junit.timeout}"
-         jvm="${junit.jvm}"
-         failureProperty="tests.failure">
 
-         <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
-         <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
-         <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
-         <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
-         <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
-         <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
-         <sysproperty key="build.testlog" value="${build.testlog}"/>
-         <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
-         <syspropertyset>
-            <propertyref prefix="jbosstest."/>
-         </syspropertyset>
-
-         <!--Lets pass some parameters from local.properties file as system properties-->
-         <syspropertyset>
-            <propertyref prefix="org.apache."/>
-         </syspropertyset>
-         <syspropertyset>
-            <propertyref prefix="apache"/>
-         </syspropertyset>
-         <syspropertyset>
-            <propertyref prefix="node"/>
-         </syspropertyset>
-
-         <!--jvmarg value="${junit.jvm.options}"/>
-         <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=y"/>
-         <jvmarg value="-Djava.compiler=NONE"/>
-         <jvmarg value="-Xdebug"/>
-         <jvmarg value="-Xnoagent"/-->
-
-         <classpath>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
-         </classpath>
-
-         <!-- definition of the property for keeping results between configuration -->
-         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
-         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" />
-
-         <batchtest todir="${build.reports}"
-            haltonerror="${junit.batchtest.haltonerror}"
-            haltonfailure="${junit.batchtest.haltonfailure}"
-            fork="${junit.batchtest.fork}">
-
-            <fileset dir="${build.classes}">
-               <patternset refid="${cluster.includes.refid}"/>
-            </fileset>
-         </batchtest>
-      </junit>
-   </target>
-
-   <target name="tests-ha-unit">
-          <mkdir dir="${build.reports}"/>
-          <mkdir dir="${build.testlog}"/>
-          <junit dir="${module.output}"
-             printsummary="${junit.printsummary}"
-             haltonerror="${junit.haltonerror}"
-             haltonfailure="${junit.haltonfailure}"
-             fork="${junit.fork}"
-             timeout="${junit.timeout}"
-             jvm="${junit.jvm}"
-             failureProperty="tests.failure">
-
-             <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
-             <sysproperty key="build.testlog" value="${build.testlog}"/>
-             <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
-         <!-- Pass along any jbosstest.* system properties -->
-         <syspropertyset>
-            <propertyref prefix="jbosstest."/>
-         </syspropertyset>
-
-             <classpath>
-                <pathelement location="${build.classes}"/>
-                <pathelement location="${build.resources}"/>
-                <path refid="tests.classpath"/>
-             </classpath>
-
-             <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
-             <sysproperty key="jboss-junit-configuration" value="tests-ha-unit"/>
-             <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
-                        usefile="${junit.formatter.usefile}"
-                        extension="-tests-ha-unit.xml"/>
-
-             <batchtest todir="${build.reports}"
-                haltonerror="${junit.batchtest.haltonerror}"
-                haltonfailure="${junit.batchtest.haltonfailure}"
-                fork="${junit.batchtest.fork}">
-
-                <fileset dir="${build.classes}">
-                     <patternset refid="ha.includes"/>
-                </fileset>
-             </batchtest>
-          </junit>
-       </target>
-
-
    <!--
       | Tests that need to be run by loading the testcase code from a client
       | jar rather than the build.classes.dir. Typically these tests need to
@@ -3788,28 +3386,6 @@
       </junit>
    </target>
 
-   <target name="one-cluster-test" if="test">
-
-    <property name="jboss-junit-configuration" value="udp"/>
-
-    <antcall target="tests-clustering-configure" inheritRefs="true"/>
-
-    <server:start name="cluster-${jboss-junit-configuration}-0"/>
-    <server:start name="cluster-${jboss-junit-configuration}-1"/>
-
-    <echo message="Going to call target tests-clustering-unit for ${test}"/>
-
-    <antcall target="tests-clustering-unit">
-      <param name="cluster.includes.refid" value="one.test.includes"/>
-      <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
-      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
-      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
-    </antcall>
-
-    <server:stop name="cluster-${jboss-junit-configuration}-0"/>
-    <server:stop name="cluster-${jboss-junit-configuration}-1"/>
-   </target>
-
    <!-- Misc tests of the testing framework itself
    -->
    <target name="tests-apache"




More information about the jboss-cvs-commits mailing list