Author: rhs
Date: Mon Jul 27 18:32:33 2009
New Revision: 798246
URL: http://svn.apache.org/viewvc?rev=798246&view=rev
Log:
rationalized naming of exclude files to make it clear why tests are excluded
and where new exclusions should go; this also corrects the exclusion lists for
some of the less common profiles since they now always include the 010Excludes
which previously had to be manually copied to the other 010 profiles
Added:
qpid/trunk/qpid/java/test-profiles/010Excludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/010ExcludeList
qpid/trunk/qpid/java/test-profiles/010PrefetchExcludes
qpid/trunk/qpid/java/test-profiles/010TransientExcludes
qpid/trunk/qpid/java/test-profiles/08Excludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/08ExcludeList
qpid/trunk/qpid/java/test-profiles/08StandaloneExcludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/08ExcludeList-nonvm
qpid/trunk/qpid/java/test-profiles/08TransientExcludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/08ExcludeList-nopersistence
qpid/trunk/qpid/java/test-profiles/Excludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/ExcludeList
qpid/trunk/qpid/java/test-profiles/XAExcludes
- copied unchanged from r798164,
qpid/trunk/qpid/java/test-profiles/XAExcludeList
Removed:
qpid/trunk/qpid/java/test-profiles/010ExcludeList
qpid/trunk/qpid/java/test-profiles/08ExcludeList
qpid/trunk/qpid/java/test-profiles/08ExcludeList-nonvm
qpid/trunk/qpid/java/test-profiles/08ExcludeList-nopersistence
qpid/trunk/qpid/java/test-profiles/ExcludeList
qpid/trunk/qpid/java/test-profiles/XAExcludeList
qpid/trunk/qpid/java/test-profiles/cpp.async.excludes
qpid/trunk/qpid/java/test-profiles/cpp.excludes
qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.excludes
qpid/trunk/qpid/java/test-profiles/default-longrunning.testprofile
Modified:
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
qpid/trunk/qpid/java/test-profiles/cpp.testprofile
qpid/trunk/qpid/java/test-profiles/default.testprofile
qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
qpid/trunk/qpid/java/test-profiles/java.testprofile
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Mon Jul 27 18:32:33 2009
@@ -239,6 +239,10 @@
</concat>
<property file="${build.scratch}/test-${profile}.properties"/>
+ <map property="test.excludefiles" value="${test.excludes}">
+ <globmapper from="*" to="${test.profiles}/*"/>
+ </map>
+
<condition property="dontruntest" value="dontruntest" else="runtest">
<contains substring="${module.name}" string="${exclude.modules}" />
@@ -535,9 +539,10 @@
<sysproperty key="broker.clean" value="${broker.clean}"/>
<sysproperty key="broker.version" value="${broker.version}"/>
<sysproperty key="broker.ready" value="${broker.ready}" />
- <sysproperty key="test.excludes" value="${test.excludes}"/>
- <sysproperty key="test.excludesfile" value="${test.excludesfile}"/>
<sysproperty key="test.output" value="${module.results}"/>
+ <syspropertyset>
+ <propertyref prefix="test"/>
+ </syspropertyset>
<sysproperty key="max_prefetch" value ="${max_prefetch}"/>
<sysproperty key="example.plugin.target"
value="${project.root}/build/lib/plugins"/>
<sysproperty key="QPID_EXAMPLE_HOME" value="${project.root}/build"/>
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Mon Jul 27 18:32:33 2009
@@ -77,11 +77,11 @@
static
{
- if (Boolean.getBoolean("test.excludes"))
+ if (Boolean.getBoolean("test.exclude"))
{
_logger.info("Some tests should be excluded, building the exclude
list");
- String exclusionListURIs =
System.getProperties().getProperty("test.excludesfile", "");
- String exclusionListString =
System.getProperties().getProperty("test.excludeslist", "");
+ String exclusionListURIs =
System.getProperties().getProperty("test.excludefiles", "");
+ String exclusionListString =
System.getProperties().getProperty("test.excludelist", "");
List<String> exclusionList = new ArrayList<String>();
for (String uri : exclusionListURIs.split("\\s+"))
Added: qpid/trunk/qpid/java/test-profiles/010PrefetchExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/010PrefetchExcludes?rev=798246&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/010PrefetchExcludes (added)
+++ qpid/trunk/qpid/java/test-profiles/010PrefetchExcludes Mon Jul 27 18:32:33
2009
@@ -0,0 +1,4 @@
+// those tests should be run with prefetch off
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveC2Only
+org.apache.qpid.client.MessageListenerMultiConsumerTest#testRecieveBoth
+org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber
Added: qpid/trunk/qpid/java/test-profiles/010TransientExcludes
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/010TransientExcludes?rev=798246&view=auto
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/010TransientExcludes (added)
+++ qpid/trunk/qpid/java/test-profiles/010TransientExcludes Mon Jul 27 18:32:33
2009
@@ -0,0 +1,10 @@
+// those tests need durable subscribe states to be persisted
+org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent
+
+// those tests require broker recovery
+org.apache.qpid.test.unit.ct.DurableSubscriberTest#*
+org.apache.qpid.test.unit.xa.TopicTest#testDurSubCrash
+org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash
+org.apache.qpid.test.unit.xa.TopicTest#testRecover
+org.apache.qpid.test.unit.xa.QueueTest#testRecover
+org.apache.qpid.test.unit.xa.QueueTest#testSendAndRecover
Modified: qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile Mon Jul 27
18:32:33 2009
@@ -1,2 +1,3 @@
include=cpp
+profile.excludes=010PrefetchExcludes
broker.modules=--load-module ${broker.module.store}
Modified: qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile Mon Jul 27
18:32:33 2009
@@ -2,7 +2,7 @@
broker.modules=--load-module ${broker.module.cluster} --cluster-name
cpp-java-test-cluster
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
${test.profiles}/XAExcludeList
+profile.excludes=XAExcludes 010PrefetchExcludes 010TransientExcludes
profile.clustered=true
profile.failoverMsgCount=10
Modified: qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile Mon Jul 27
18:32:33 2009
@@ -1,3 +1,3 @@
include=cpp
-test.excludesfile=${test.profiles}/ExcludeList
${test.profiles}/010ExcludeList-noPrefetch
+profile.excludes=010TransientExcludes
max_prefetch=0
Modified: qpid/trunk/qpid/java/test-profiles/cpp.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/cpp.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/cpp.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/cpp.testprofile Mon Jul 27 18:32:33 2009
@@ -14,4 +14,5 @@
broker=${broker.executable} -p @PORT --data-dir ${build.data}/@PORT -t --auth
no --no-module-dir ${broker.modules} ${broker.args}
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
${test.profiles}/${profile}.excludes
+profile.excludes=010PrefetchExcludes 010TransientExcludes
+test.excludes=Excludes 010Excludes ${profile}.excludes ${profile.excludes}
Modified: qpid/trunk/qpid/java/test-profiles/default.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/default.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/default.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/default.testprofile Mon Jul 27 18:32:33
2009
@@ -20,8 +20,9 @@
test.port.ssl=15671
test.port.alt=15673
-test.excludes=true
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList
${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence
+test.exclude=true
+profile.excludes=08TransientExcludes
+test.excludes=Excludes XAExcludes 08Excludes ${profile}.excludes
${profile.excludes}
test.fork=no
test.mem=512M
test=*Test
Modified: qpid/trunk/qpid/java/test-profiles/java-derby.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-derby.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-derby.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-derby.testprofile Mon Jul 27
18:32:33 2009
@@ -4,4 +4,4 @@
broker.ready=Qpid Broker Ready
broker.config=${project.root}/build/etc/config-systests-derby.xml
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList
${test.profiles}/08ExcludeList-nonvm
+profile.excludes=08StandaloneExcludes
Modified: qpid/trunk/qpid/java/test-profiles/java.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java.testprofile?rev=798246&r1=798245&r2=798246&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java.testprofile Mon Jul 27 18:32:33 2009
@@ -3,4 +3,4 @@
broker.clean=${test.profiles}/clean-dir ${build.data}
${project.root}/build/work/derbyDB
broker.ready=Qpid Broker Ready
-test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList
${test.profiles}/08ExcludeList-nonvm
${test.profiles}/08ExcludeList-nopersistence
+profile.excludes=08TransientExcludes 08StandaloneExcludes
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
