[jboss-cvs] JBossAS SVN: r106357 - in branches/Branch_No_Multicast/testsuite: imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 30 23:50:53 EDT 2010
Author: smarlow at redhat.com
Date: 2010-06-30 23:50:53 -0400 (Wed, 30 Jun 2010)
New Revision: 106357
Modified:
branches/Branch_No_Multicast/testsuite/build.xml
branches/Branch_No_Multicast/testsuite/imports/server-config.xml
Log:
exclude HttpsUnitTestCase test and enhance run-junit macro with an exclude pattern set parameter
Modified: branches/Branch_No_Multicast/testsuite/build.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/build.xml 2010-07-01 00:42:52 UTC (rev 106356)
+++ branches/Branch_No_Multicast/testsuite/build.xml 2010-07-01 03:50:53 UTC (rev 106357)
@@ -1485,25 +1485,27 @@
<!-- A placeholder patternset -->
<patternset id="empty.patternset"/>
+
<!-- Tests to exclude when we run on EC2 -->
<patternset id="ec2.excludes">
<!-- These tests involve multicast-based HA-JNDI auto-discovery -->
<exclude name="org/jboss/test/naming/test/NamingRestartAutoDiscoveryUnitTestCase.class"/>
<exclude name="org/jboss/test/naming/test/HAJndiAutoDiscoveryTestCase.class"/>
- <exclude name="org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorAutoDiscoveryUnitTestCase.class"/>
- <exclude name="org/jboss/test/cluster/defaultcfg/ejb2/test/SingleRetryInterceptorAutoDiscoveryUnitTestCase.class"/>
- <exclude name="org/jboss/test/cluster/multicfg/test/HAJndiAutoDiscoveryTestCase.class"/>
- <exclude name="org/jboss/test/cluster/multicfg/test/GlobalDiscoveryDisableTestCase.class"/>
- <!-- These programatically create UDP-based channels -->
- <exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/*TestCase.class"/>
- <!-- These tests depend on DownloadServerClasses=true which is currently false -->
- <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
- <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/>
- <exclude name="org/jboss/test/jrmp/test/DynLoadingUnitTestCase.class"/>
- <!-- This test expects a session bean call that leaks a db connection to result in a remote exception. That is a debug feature that is disabled -->
- <exclude name="org/jboss/test/jca/test/CachedConnectionErrorUnitTestCase.class"/>
- <!-- For unknown reasons, HttpsUnitTestCase test fails when the JGroups is using the S3_PING protocol. perhaps related to the use of SSL system properties like javax.net.ssl.trustStore -->
- <exclude name="org/jboss/test/security/test/HttpsUnitTestCase.class"/>
+ <exclude name="org/jboss/test/cluster/defaultcfg/ejb2/test/RetryInterceptorAutoDiscoveryUnitTestCase.class"/>
+ <exclude name="org/jboss/test/cluster/defaultcfg/ejb2/test/SingleRetryInterceptorAutoDiscoveryUnitTestCase.class"/>
+ <exclude name="org/jboss/test/cluster/multicfg/test/HAJndiAutoDiscoveryTestCase.class"/>
+ <exclude name="org/jboss/test/cluster/multicfg/test/GlobalDiscoveryDisableTestCase.class"/>
+ <!-- These programatically create UDP-based channels -->
+ <exclude name="org/jboss/test/cluster/defaultcfg/simpleweb/test/*TestCase.class"/>
+ <!-- These tests depend on DownloadServerClasses=true which is currently false -->
+ <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
+ <exclude name="org/jboss/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/>
+ <exclude name="org/jboss/test/jrmp/test/DynLoadingUnitTestCase.class"/>
+ <!-- This test expects a session bean call that leaks a db connection to result in a remote exception. That is a debug feature that is disabled -->
+ <exclude name="org/jboss/test/jca/test/CachedConnectionErrorUnitTestCase.class"/>
+ <!-- The HttpsUnitTestCase unreasonably expects to change the SSL keystore using system properties like javax.net.ssl.trustStore -->
+ <exclude name="org/jboss/test/security/test/HttpsUnitTestCase.class"/>
+ <patternset refid="badtest.excludes"/>
</patternset>
<!-- A target that allows for conditional dependency on the compilation and
@@ -1658,7 +1660,10 @@
<param name="custom.excludes" value="ec2.excludes"/>
</antcall>
- <antcall target="tests-security-basic-unit"/>
+ <antcall target="tests-security-basic-unit">
+ <param name="custom.excludes" value="ec2.excludes"/>
+ </antcall>
+
<antcall target="tests-standard-stress"/>
<antcall target="tests-jbossmx-compliance"/>
<antcall target="tests-jbossmx-implementation"/>
@@ -2331,15 +2336,18 @@
<target name="tests-security-basic-unit">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
+ <property name="custom.excludes" value="empty.patternset"/>
<property name="jbosstest.secure" value="true"/>
<property name="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
<propertyset id="security-tests-props">
<propertyref prefix="java.security.auth"/>
</propertyset>
+
<run-junit junit.patternset="security.includes"
junit.syspropertyset="security-tests-props"
- junit.configuration="tests-security-basic-unit" />
+ junit.configuration="tests-security-basic-unit"
+ junit.excludeset="${custom.excludes}"/>
</target>
<!-- Tests of Java2 permissions. The JBoss server must be running with
Modified: branches/Branch_No_Multicast/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-07-01 00:42:52 UTC (rev 106356)
+++ branches/Branch_No_Multicast/testsuite/imports/server-config.xml 2010-07-01 03:50:53 UTC (rev 106357)
@@ -1639,6 +1639,7 @@
-@{junit.configuration}.xml.
junit.syspropertyset : optional propertyset id that will be passed as
system properties to the junit jvm.
+ junit.excludeset : optional patternset of classes to exclude from unit test.
-->
<macrodef name="run-junit"
description="Run a batch of junit on the given patternset">
@@ -1648,6 +1649,8 @@
description="An optional configuration name added to the test and extention" />
<attribute name="junit.syspropertyset" default="jbosstest-props"
description="An optional propertyset id that will be passed as system properties" />
+ <attribute name="junit.excludeset" default="badtest.excludes"
+ description="used to exclude the tests to run" />
<sequential>
<!-- Set the report extension based on the -->
@@ -1712,7 +1715,7 @@
<fileset dir="${build.classes}">
<patternset refid="@{junit.patternset}"/>
- <patternset refid="badtest.excludes"/>
+ <patternset refid="@{junit.excludeset}"/>
</fileset>
</batchtest>
</junit>
More information about the jboss-cvs-commits
mailing list