[Jboss-cvs] JBossAS SVN: r55140 - trunk/testsuite

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

Author: bstansberry at jboss.com
Date: 2006-08-03 17:22:20 -0400 (Thu, 03 Aug 2006)
New Revision: 55140

Modified:
   trunk/testsuite/build.xml
Log:
Run separate tests with BuddyReplication disabled

Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml	2006-08-03 21:11:25 UTC (rev 55139)
+++ trunk/testsuite/build.xml	2006-08-03 21:22:20 UTC (rev 55140)
@@ -855,8 +855,9 @@
       <antcall target="tests-ha-unit"></antcall>
    </target>
 
-   <target name="tests-clustering"
-      description="Execute clustering tests requiring two nodes.">
+  <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks -->
+  <target name="tests-clustering"
+    description="Execute clustering tests requiring two nodes.">
 
     <antcall target="tests-clustering-configure" inheritRefs="true"/>
 
@@ -870,7 +871,7 @@
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
     </antcall>
 
-    <echo message="Going to call target tests-clustering-unit for HTTP tests"/>
+    <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.includes"/>
@@ -882,7 +883,7 @@
 
     <sleep seconds="4"/>
 
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests"/>
+    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-field-configure" inheritRefs="true"/>
 
@@ -899,9 +900,11 @@
 
     <sleep seconds="4"/>
 
-    <echo message="Going to call target tests-clustering-unit again with new configuration"/>
+    <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
 
-    <antcall target="tests-clustering-startup-with-config-change"/>
+    <antcall target="tests-clustering-startup-with-config-change">
+       <param name="br.enabled" value="false"/>
+    </antcall>
 
     <server:start name="node0"/>
     <server:start name="node1"/>
@@ -921,9 +924,11 @@
 
     <sleep seconds="4"/>
 
-    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration"/>
+    <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-startup-with-config-change"/>
+    <antcall target="tests-clustering-field-startup-with-config-change">
+       <param name="br.enabled" value="false"/>
+    </antcall>
 
     <server:start name="node0"/>
     <server:start name="node1"/>
@@ -936,44 +941,83 @@
     <server:stop name="node0"/>
     <server:stop name="node1"/>
 
-   </target>
+    <sleep seconds="4"/>
 
-   <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
-      <create-cluster-node conf="node0"/>
-      <create-cluster-node conf="node1"/>
-   </target>
+    <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
 
-   <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
-      <create-cluster-node conf="node0"/>
-      <create-cluster-node conf="node1"/>
+    <antcall target="tests-clustering-startup-with-config-change">
+       <param name="br.enabled" value="true"/>
+    </antcall>
 
-      <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-      <http-cluster-field-node-config-change conf="node0"/>
-      <http-cluster-field-node-config-change conf="node1"/>
-   </target>
+    <server:start name="node0"/>
+    <server:start name="node1"/>
 
-   <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}">
-      <create-cluster-node conf="node0"/>
-      <create-cluster-node conf="node1"/>
+    <antcall target="tests-clustering-unit">
+      <param name="cluster.includes.refid" value="cluster.http.includes"/>
+      <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+    </antcall>
 
-      <echo message="Modifying the node0 and node1 Tomcat configuration"/>
-      <http-cluster-node-config-change conf="node0"/>
-      <http-cluster-node-config-change conf="node1"/>
-   </target>
+    <server:stop name="node0"/>
+    <server:stop name="node1"/>
 
-   <target name="tests-clustering-field-startup-with-config-change" unless="${tests.clustering.skip.startup}">
-      <create-cluster-node conf="node0"/>
-      <create-cluster-node conf="node1"/>
+    <sleep seconds="4"/>
 
-      <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
-      <http-cluster-field-node-config-change conf="node0"/>
-      <http-cluster-field-node-config-change conf="node1"/>
+    <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests with new configuration (SYNC, with BR)"/>
 
-      <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK"/>
-      <http-cluster-node-config-change conf="node0"/>
-      <http-cluster-node-config-change conf="node1"/>
-   </target>
+    <antcall target="tests-clustering-field-startup-with-config-change">
+       <param name="br.enabled" value="true"/>
+    </antcall>
 
+    <server:start name="node0"/>
+    <server:start name="node1"/>
+
+    <antcall target="tests-clustering-unit">
+      <param name="cluster.includes.refid" value="cluster.field.includes"/>
+      <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+    </antcall>
+
+    <server:stop name="node0"/>
+    <server:stop name="node1"/>
+
+  </target>
+
+  <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="node0"/>
+    <create-cluster-node conf="node1"/>
+  </target>
+
+  <target name="tests-clustering-field-configure" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="node0"/>
+    <create-cluster-node conf="node1"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
+    <http-cluster-field-node-config-change conf="node0"/>
+    <http-cluster-field-node-config-change conf="node1"/>
+  </target>
+
+  <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="node0"/>
+    <create-cluster-node conf="node1"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR=${br.enabled}"/>
+    <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
+    <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+  </target>
+
+  <target name="tests-clustering-field-startup-with-config-change" unless="${tests.clustering.skip.startup}">
+    <create-cluster-node conf="node0"/>
+    <create-cluster-node conf="node1"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for FIELD"/>
+    <http-cluster-field-node-config-change conf="node0"/>
+    <http-cluster-field-node-config-change conf="node1"/>
+
+    <echo message="Modifying the node0 and node1 Tomcat configuration for REPL_SYNC/UseJK/BR=${br.enabled}"/>
+    <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
+    <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+  </target>
+
+
    <!-- Tests of tomcat needing a ssl connector
    -->
    <target name="tomcat-ssl-tests"