[Jboss-cvs] JBossAS SVN: r55507 - trunk/testsuite
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 10 18:17:52 EDT 2006
Author: bstansberry at jboss.com
Date: 2006-08-10 18:17:51 -0400 (Thu, 10 Aug 2006)
New Revision: 55507
Modified:
trunk/testsuite/build.xml
Log:
[JBAS-3506] Maintain the server logs for the different testsuite clustering configs
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2006-08-10 21:38:51 UTC (rev 55506)
+++ trunk/testsuite/build.xml 2006-08-10 22:17:51 UTC (rev 55507)
@@ -769,7 +769,7 @@
<antcall target="jboss-minimal-tests" />
<antcall target="jboss-all-config-tests"/>
<antcall target="tests-security-manager"/>
- <antcall target="tests-clustering"/>
+ <antcall target="tests-clustering-all-stacks"/>
<!-- <antcall target="tomcat-ssl-tests"/>-->
<antcall target="tomcat-sso-tests"/>
<antcall target="tomcat-sso-clustered-tests"/>
@@ -855,63 +855,85 @@
<antcall target="tests-ha-unit"></antcall>
</target>
- <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks -->
+ <!-- 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.
+ Disabled until http://jira.jboss.com/jira/browse/JBAS-1761 is resolved
+ <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 -->
<target name="tests-clustering"
description="Execute clustering tests requiring two nodes.">
<antcall target="tests-clustering-configure" inheritRefs="true"/>
- <server:start name="node0"/>
- <server:start name="node1"/>
+ <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)"/>
- <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"/>
<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="node0"/>
- <server:stop name="node1"/>
-
+-->
+ <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, no BR)"/>
+ <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="node0"/>
- <server:start name="node1"/>
+ <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="node0"/>
- <server:stop name="node1"/>
+ <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, no BR)"/>
+ <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, with BR)"/>
- <antcall target="tests-clustering-startup-with-config-change">
- <param name="br.enabled" value="false"/>
- </antcall>
+ <antcall target="tests-clustering-sync-configure"/>
- <server:start name="node0"/>
- <server:start name="node1"/>
+ <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">
@@ -919,105 +941,127 @@
<param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
</antcall>
- <server:stop name="node0"/>
- <server:stop name="node1"/>
+ <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, no BR)"/>
+ <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-startup-with-config-change">
- <param name="br.enabled" value="false"/>
- </antcall>
+ <antcall target="tests-clustering-field-sync-configure"/>
- <server:start name="node0"/>
- <server:start name="node1"/>
+ <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="node0"/>
- <server:stop name="node1"/>
+ <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, with BR)"/>
+ <echo message="Going to call target tests-clustering-unit again with new configuration (SYNC, no BR)"/>
- <antcall target="tests-clustering-startup-with-config-change">
- <param name="br.enabled" value="true"/>
- </antcall>
+ <antcall target="tests-clustering-total-configure"/>
- <server:start name="node0"/>
- <server:start name="node1"/>
+ <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="BuddyReplEnabled-${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="node0"/>
- <server:stop name="node1"/>
+ <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, with BR)"/>
+ <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">
- <param name="br.enabled" value="true"/>
- </antcall>
+ <antcall target="tests-clustering-field-total-configure"/>
- <server:start name="node0"/>
- <server:start name="node1"/>
+ <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="BuddyReplEnabled-${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="node0"/>
- <server:stop name="node1"/>
-
+ <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="node0"/>
- <create-cluster-node conf="node1"/>
+ <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="node0"/>
- <create-cluster-node conf="node1"/>
+ <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="node0"/>
- <http-cluster-field-node-config-change conf="node1"/>
+ <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-startup-with-config-change" unless="${tests.clustering.skip.startup}">
- <create-cluster-node conf="node0"/>
- <create-cluster-node conf="node1"/>
+ <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/BR=${br.enabled}"/>
- <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
- <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+ <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-startup-with-config-change" unless="${tests.clustering.skip.startup}">
- <create-cluster-node conf="node0"/>
- <create-cluster-node conf="node1"/>
+ <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="node0"/>
- <http-cluster-field-node-config-change conf="node1"/>
+ <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/BR=${br.enabled}"/>
- <http-cluster-node-config-change conf="node0" useBuddyRepl="${br.enabled}"/>
- <http-cluster-node-config-change conf="node1" useBuddyRepl="${br.enabled}"/>
+ <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>
+
+
<!-- Tests of tomcat needing a ssl connector
-->
<target name="tomcat-ssl-tests"
More information about the jboss-cvs-commits
mailing list