[jboss-cvs] JBossAS SVN: r106101 - in branches/Branch_No_Multicast/testsuite: imports/config and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 16 23:59:21 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-06-16 23:59:21 -0400 (Wed, 16 Jun 2010)
New Revision: 106101
Modified:
branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
branches/Branch_No_Multicast/testsuite/imports/server-config.xml
branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
Log:
[JBPAPP-4482] Some more test setup tweaks
Modified: branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml 2010-06-17 02:40:24 UTC (rev 106100)
+++ branches/Branch_No_Multicast/testsuite/imports/config/tests-clustering.xml 2010-06-17 03:59:21 UTC (rev 106101)
@@ -106,10 +106,12 @@
<!-- Test the default UDP stack. Run all the tests. -->
<antcall target="tests-clustering">
<param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
</antcall>
<!-- Test a TCP stack but with a more limited set of tests.-->
<antcall target="tests-clustering-multicfg">
<param name="jboss.default.jgroups.stack" value="tcp"/>
+ <param name="baseconf" value="all"/>
</antcall>
<!-- Test a TCPGOSSIP stack but with a more limited set of tests..
@@ -128,14 +130,17 @@
<!-- Test user transaction sticky with default stack. Left out of the
other clustering tests because it needs a separate different configuration.
-->
- <antcall target="tests-clustered-ustxsticky">
+ <antcall target="run-clustered-ustxsticky-tests">
<param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
</antcall>
- <antcall target="tests-clustered-profileservice">
+ <antcall target="run-clustered-profileservice-tests">
<param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
</antcall>
- <antcall target="tomcat-sso-clustered-tests">
+ <antcall target="run-tomcat-sso-clustered-tests">
<param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
</antcall>
</target>
<target name="foo">
@@ -156,11 +161,9 @@
<!-- Runs only the multicfg tests -->
<target name="tests-clustering-multicfg">
- <!-- If protocol stack wasn't passed in, set to default now -->
- <property name="jboss.default.jgroups.stack" value="udp"/>
-
- <antcall target="tests-clustering">
- <param name="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}"/>
+ <antcall target="clustering-core-tests" inheritRefs="true">
+ <param name="baseconf" value="all"/>
+ <param name="jboss.default.jgroups.stack" value="udp"/>
<param name="cluster.non.http.includes" value="cluster.multicfg.non.http.includes"/>
<param name="cluster.http.includes" value="cluster.multicfg.http.includes"/>
<param name="cluster.http.field.includes" value="cluster.multicfg.http.field.includes"/>
@@ -173,12 +176,25 @@
<target name="tests-clustering"
description="Execute clustering tests requiring two nodes.">
- <!-- If configuration values weren't passed in, set them to defaults now -->
+ <!-- Default jgroups stack to use -->
<property name="jboss.default.jgroups.stack" value="udp"/>
- <property name="cluster.non.http.includes" value="cluster.defaultcfg.non.http.includes"/>
- <property name="cluster.http.includes" value="cluster.defaultcfg.http.includes"/>
- <property name="cluster.http.field.includes" value="cluster.defaultcfg.http.field.includes"/>
- <property name="cluster.http.jk.includes" value="cluster.defaultcfg.http.jk.includes"/>
+ <!-- Default configuration to build the test config from -->
+ <property name="baseconf" value="all"/>
+
+ <antcall target="clustering-core-tests" inheritRefs="true">
+ <param name="baseconf" value="${baseconf}"/>
+ <param name="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}"/>
+ <param name="cluster.non.http.includes" value="cluster.defaultcfg.non.http.includes"/>
+ <param name="cluster.http.includes" value="cluster.defaultcfg.http.includes"/>
+ <param name="cluster.http.field.includes" value="cluster.defaultcfg.http.field.includes"/>
+ <param name="cluster.http.jk.includes" value="cluster.defaultcfg.http.jk.includes"/>
+ </antcall>
+
+ </target>
+
+ <!-- Depending on the value of the ${jboss.default.jgroups.stack} variable, uses different JGroups stacks -->
+ <target name="clustering-core-tests"
+ description="Execute clustering tests requiring two nodes.">
<antcall target="tests-clustering-configure" inheritRefs="true"/>
@@ -381,9 +397,16 @@
<server:stop name="cluster-classloader-leak-0"/>
<server:stop name="cluster-classloader-leak-1"/>
- </target>
+ </target>
<target name="tests-clustered-profileservice">
+ <antcall target="run-clustered-profileservice-tests" inheritrefs="true">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
+ </antcall>
+ </target>
+
+ <target name="run-clustered-profileservice-tests">
<!-- Default jgroups stack to use -->
<property name="jboss.default.jgroups.stack" value="udp"/>
@@ -412,11 +435,13 @@
</target>
<target name="tests-clustered-ustxsticky">
+ <antcall target="run-clustered-ustxsticky-tests" inheritrefs="true">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
+ </antcall>
+ </target>
- <!-- Default jgroups stack to use -->
- <property name="jboss.default.jgroups.stack" value="udp"/>
- <!-- Default configuration to build the test config from -->
- <property name="baseconf" value="all"/>
+ <target name="run-clustered-ustxsticky-tests">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
@@ -440,11 +465,6 @@
</target>
<target name="tests-clustering-ec2">
-
- <!-- Default jgroups stack to use -->
- <property name="jboss.default.jgroups.stack" value="tcp"/>
- <!-- Default configuration to build the test config from -->
- <property name="baseconf" value="cluster-ec2"/>
<!-- Create tests-configs content for cluster-tcp-0/1 from the cluster-udp content -->
<mkdir dir="${build.resources}/test-configs/cluster-tcp-0"/>
@@ -454,12 +474,25 @@
<mkdir dir="${build.resources}/test-configs/cluster-tcp-1"/>
<copy todir="${build.resources}/test-configs/cluster-tcp-1">
<fileset dir="${build.resources}/test-configs/cluster-udp-1" />
- </copy>
- <antcall target="tests-clustering-configure" inheritRefs="true"/>
- <!--<antcall target="tests-clustering" inheritrefs="true"/>
- <antcall target="tests-clustered-profileservice" inheritrefs="true"/>
- <antcall target="tests-clustered-ustxsticky" inheritrefs="true"/>
- <antcall target="tomcat-sso-clustered-tests" inheritrefs="true"/>-->
+ </copy>
+
+ <antcall target="tests-clustering">
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
+ <param name="baseconf" value="cluster-ec2"/>
+ </antcall>
+ <antcall target="run-clustered-ustxsticky-tests">
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
+ <param name="baseconf" value="cluster-ec2"/>
+ </antcall>
+ <antcall target="run-clustered-profileservice-tests">
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
+ <param name="baseconf" value="cluster-ec2"/>
+ </antcall>
+ <antcall target="run-tomcat-sso-clustered-tests">
+ <param name="jboss.default.jgroups.stack" value="tcp"/>
+ <param name="baseconf" value="cluster-ec2"/>
+ </antcall>
+
</target>
<!--
@@ -519,13 +552,17 @@
</copy>
</target>
- <target name="tomcat-sso-clustered-tests"
+ <target name="tests-clustered-sso"
description="Tomcat tests requiring clustered SSO configured">
+ <antcall target="run-tomcat-sso-clustered-tests" inheritrefs="true">
+ <param name="jboss.default.jgroups.stack" value="udp"/>
+ <param name="baseconf" value="all"/>
+ </antcall>
+ </target>
+
+ <target name="run-tomcat-sso-clustered-tests"
+ description="Tomcat tests requiring clustered SSO configured">
- <!-- Default jgroups stack to use -->
- <property name="jboss.default.jgroups.stack" value="udp"/>
- <!-- Default configuration to build the test config from -->
- <property name="baseconf" value="all"/>
<!-- Create the sso enabled tomcat config starting with the all config -->
<create-cluster-sso-node newconf="tomcat-sso-cluster0" baseconf="${baseconf}"/>
<create-cluster-sso-node newconf="tomcat-sso-cluster1" baseconf="${baseconf}"/>
@@ -579,6 +616,7 @@
<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"/>
+ <sysproperty key="jboss.default.jgroups.stack" value="${jboss.default.jgroups.stack}"/>
<!-- Pass along any jbosstest.* system properties -->
<syspropertyset>
<propertyref prefix="jbosstest."/>
@@ -757,8 +795,6 @@
<!-- Runs only the non-http tests -->
<target name="tests-clustering-non-http">
- <property name="jboss.default.jgroups.stack" value="udp"/>
-
<antcall target="tests-clustering-configure" inheritRefs="true"/>
<server:start name="cluster-${jboss.default.jgroups.stack}-0"/>
@@ -780,8 +816,6 @@
<!-- Runs only the basic http tests (ASYNC, no BR) -->
<target name="tests-clustering-http">
- <property name="jboss.default.jgroups.stack" value="udp"/>
-
<antcall target="tests-clustering-configure" inheritRefs="true"/>
<server:start name="cluster-${jboss.default.jgroups.stack}-0"/>
@@ -802,10 +836,8 @@
<!-- Runs only the basic http tests (ASYNC, with BR) -->
<target name="tests-clustering-http-br">
- <property name="jboss.default.jgroups.stack" value="udp"/>
+ <antcall target="tests-clustering-br-configure" inheritRefs="true"/>
- <antcall target="tests-clustering-br-configure" inheritRefs="true"/>
-
<server:start name="cluster-${jboss.default.jgroups.stack}-BR-0"/>
<server:start name="cluster-${jboss.default.jgroups.stack}-BR-1"/>
@@ -825,8 +857,6 @@
<!-- Runs only the basic field tests (ASYNC, no BR) -->
<target name="tests-clustering-field">
- <property name="jboss.default.jgroups.stack" value="udp"/>
-
<antcall target="tests-clustering-field-configure" inheritRefs="true"/>
<server:start name="cluster-field-${jboss.default.jgroups.stack}-0"/>
@@ -849,8 +879,6 @@
<!-- Runs only the basic field tests (SYNC, with BR) -->
<target name="tests-clustering-field-br">
- <property name="jboss.default.jgroups.stack" value="udp"/>
-
<antcall target="tests-clustering-field-br-configure" inheritRefs="true"/>
<server:start name="cluster-field-${jboss.default.jgroups.stack}-BR-0"/>
Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-06-17 02:40:24 UTC (rev 106100)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-06-17 03:59:21 UTC (rev 106101)
@@ -1548,7 +1548,7 @@
description="The jboss dist root directory" />
<element name="patternset" />
<sequential>
- <echo message="creating @{newconf} config"/>
+ <echo message="creating @{newconf} config from @{baseconf}"/>
<copy todir="@{jboss.dist}/server/@{newconf}" filtering="false">
<fileset dir="@{jboss.dist}/server/@{baseconf}">
<patternset />
Modified: branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java
===================================================================
--- branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-06-17 02:40:24 UTC (rev 106100)
+++ branches/Branch_No_Multicast/testsuite/src/main/org/jboss/test/cluster/defaultcfg/test/ChannelFactoryManagedObjectsTestCase.java 2010-06-17 03:59:21 UTC (rev 106101)
@@ -175,6 +175,11 @@
public void testUpdateProtocolStackConfigurations() throws Exception
{
+ // Don't run this test if we're running the cluster-ec2 config
+ // Detect that by seeing if the default stack is tcp
+ if ("tcp".equals(System.getProperty("jboss.default.jgroups.stack", "udp")))
+ return;
+
ManagedComponent component = getChannelFactoryManagedComponent();
ManagedProperty prop = component.getProperty("protocolStackConfigurations");
MetaValue mapValue = prop.getValue();
More information about the jboss-cvs-commits
mailing list