[Jboss-cvs] JBossAS SVN: r56905 - branches/Branch_4_0/testsuite

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-09-16 00:24:24 -0400 (Sat, 16 Sep 2006)
New Revision: 56905

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
[JBAS-2272] Get testsuite working with clustered TCP tests

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2006-09-16 04:21:03 UTC (rev 56904)
+++ branches/Branch_4_0/testsuite/build.xml	2006-09-16 04:24:24 UTC (rev 56905)
@@ -575,10 +575,16 @@
     <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"/>
+    <!-- PartitionRestartUnitTestCase fails with TCP stack and JG 2.2.7 -->
+    <exclude name="org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.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" />
   </patternset>
+  <!-- With JG 2.2.7, only run this test with UDP; known failure with TCP -->
+  <patternset id="cluster.non.http.udp.includes">
+    <include name="org/jboss/test/cluster/partition/test/PartitionRestartUnitTestCase.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"/>
@@ -1049,13 +1055,13 @@
     <antcall target="tests-clustering">
       <param name="jboss-junit-configuration" value="UDP"/>
     </antcall>
-    <!-- Test a TCP stack.
-      Disabled until http://jira.jboss.com/jira/browse/JBAS-1761 is resolved
+    
+    <!-- Test a TCP stack. -->
     <antcall target="tests-clustering">
       <param name="jgroups-stack" value="TCP"/>
       <param name="jboss-junit-configuration" value="TCP"/>
     </antcall>
-    -->
+    
   </target>
 
   <!-- Depending on the value of the ${jboss-junit-configuration} variable, uses different JGroups stacks -->
@@ -1069,16 +1075,18 @@
 
     <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-udp" inheritRefs="true"/>
+    
     <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>
-
+    </antcall>    
+    
     <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-unit">
@@ -1193,6 +1201,17 @@
 
   </target>
 
+  <target name="tests-clustering-udp" unless="jgroups-stack">
+
+    <antcall target="tests-clustering-unit">
+      <param name="cluster.includes.refid" value="cluster.non.http.udp.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>
+    
+  </target>
+
   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-0" host="${node0}"/>
     <create-cluster-node conf="cluster-${jboss-junit-configuration}-1" host="${node1}"/>
@@ -3238,6 +3257,12 @@
     <server:stop name="cluster-${jboss-junit-configuration}-0"/>
     <server:stop name="cluster-${jboss-junit-configuration}-1"/>
    </target>
+   
+  <target name="one-cluster-test-tcp">
+     <property name="jgroups-stack" value="TCP"/>
+     <property name="jboss-junit-configuration" value="TCP"/>
+     <antcall target="one-cluster-test" inheritRefs="true"/>
+  </target>
 
   <!-- Misc tests of the testing framework itself
   -->