From bcf89b1af8b1d4a0262530b50e5433cdaffb91f0 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Mon, 27 Jul 2009 18:32:33 +0000 Subject: 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 git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@798246 13f79535-47bb-0310-9956-ffa450edef68 --- java/module.xml | 9 ++- .../org/apache/qpid/test/utils/QpidTestCase.java | 6 +- java/test-profiles/010ExcludeList | 79 ---------------------- java/test-profiles/010Excludes | 79 ++++++++++++++++++++++ java/test-profiles/010PrefetchExcludes | 4 ++ java/test-profiles/010TransientExcludes | 10 +++ java/test-profiles/08ExcludeList | 17 ----- java/test-profiles/08ExcludeList-nonvm | 42 ------------ java/test-profiles/08ExcludeList-nopersistence | 1 - java/test-profiles/08Excludes | 17 +++++ java/test-profiles/08StandaloneExcludes | 42 ++++++++++++ java/test-profiles/08TransientExcludes | 1 + java/test-profiles/ExcludeList | 7 -- java/test-profiles/Excludes | 7 ++ java/test-profiles/XAExcludeList | 3 - java/test-profiles/XAExcludes | 3 + java/test-profiles/cpp.async.excludes | 4 -- java/test-profiles/cpp.async.testprofile | 1 + java/test-profiles/cpp.cluster.testprofile | 2 +- java/test-profiles/cpp.excludes | 15 ---- java/test-profiles/cpp.noprefetch.excludes | 10 --- java/test-profiles/cpp.noprefetch.testprofile | 2 +- java/test-profiles/cpp.testprofile | 3 +- java/test-profiles/default-longrunning.testprofile | 1 - java/test-profiles/default.testprofile | 5 +- java/test-profiles/java-derby.testprofile | 2 +- java/test-profiles/java.testprofile | 2 +- 27 files changed, 183 insertions(+), 191 deletions(-) delete mode 100644 java/test-profiles/010ExcludeList create mode 100644 java/test-profiles/010Excludes create mode 100644 java/test-profiles/010PrefetchExcludes create mode 100644 java/test-profiles/010TransientExcludes delete mode 100644 java/test-profiles/08ExcludeList delete mode 100644 java/test-profiles/08ExcludeList-nonvm delete mode 100644 java/test-profiles/08ExcludeList-nopersistence create mode 100644 java/test-profiles/08Excludes create mode 100644 java/test-profiles/08StandaloneExcludes create mode 100644 java/test-profiles/08TransientExcludes delete mode 100644 java/test-profiles/ExcludeList create mode 100644 java/test-profiles/Excludes delete mode 100644 java/test-profiles/XAExcludeList create mode 100644 java/test-profiles/XAExcludes delete mode 100644 java/test-profiles/cpp.async.excludes delete mode 100644 java/test-profiles/cpp.excludes delete mode 100644 java/test-profiles/cpp.noprefetch.excludes delete mode 100644 java/test-profiles/default-longrunning.testprofile (limited to 'java') diff --git a/java/module.xml b/java/module.xml index 9bf0270bd6..f31a52f0ff 100644 --- a/java/module.xml +++ b/java/module.xml @@ -239,6 +239,10 @@ + + + + @@ -535,9 +539,10 @@ - - + + + diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java index 735aa4b1de..91732bc010 100644 --- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java +++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java @@ -77,11 +77,11 @@ public class QpidTestCase extends TestCase 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 exclusionList = new ArrayList(); for (String uri : exclusionListURIs.split("\\s+")) diff --git a/java/test-profiles/010ExcludeList b/java/test-profiles/010ExcludeList deleted file mode 100644 index 69077a97c8..0000000000 --- a/java/test-profiles/010ExcludeList +++ /dev/null @@ -1,79 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* - -//These tests are for the java broker -org.apache.qpid.server.security.acl.SimpleACLTest#* -org.apache.qpid.server.plugins.PluginTest#* - -// This test is not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover - -// Those tests are testing 0.8 specific semantics -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub -org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub -org.apache.qpid.test.client.FlowControlTest#* -org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure - -// the 0.10 c++ broker does not implement forget -org.apache.qpid.test.unit.xa.FaultTest#testForget - -// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation -org.apache.qpid.server.queue.PriorityTest - -//this test checks explicitly for 0-8 flow control semantics -org.apache.qpid.test.client.FlowControlTest - -// 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges -org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure -org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges - -// 0-10 c++ broker in cpp.testprofile is started with no auth so won't pass this test -org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection - -// c++ broker doesn't do selectors, so this will fail -org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue - -// InVM Broker tests -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* - -// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* - -// c++ broker doesn't support priorities, TTL or message bouncing -org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* -org.apache.qpid.server.queue.PriorityTest#* -org.apache.qpid.server.queue.TimeToLiveTest#* - -// QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on transient queues. Also it requries a persistent store impl. for Apache -org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#* - -// This test currently does not pick up the runtime location of the nonVm queueBacking store. -org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* - -// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM -org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* - -//QPID-1818 : 0-10 Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - -// QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently -org.apache.qpid.server.AlertingTest#* - -// The C++ server has a totally different persistence mechanism -org.apache.qpid.server.store.PersistentStoreTest#* - -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess - diff --git a/java/test-profiles/010Excludes b/java/test-profiles/010Excludes new file mode 100644 index 0000000000..69077a97c8 --- /dev/null +++ b/java/test-profiles/010Excludes @@ -0,0 +1,79 @@ +org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* +org.apache.qpid.client.ResetMessageListenerTest#* + +//These tests are for the java broker +org.apache.qpid.server.security.acl.SimpleACLTest#* +org.apache.qpid.server.plugins.PluginTest#* + +// This test is not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover + +// Those tests are testing 0.8 specific semantics +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxP2P +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsConsumerDisconnectedTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.ImmediateMessageTest#test_QPID_517_ImmediateFailsNoRouteTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxP2P +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteNoTxPubSub +org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFailsNoRouteTxPubSub +org.apache.qpid.test.client.FlowControlTest#* +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure + +// the 0.10 c++ broker does not implement forget +org.apache.qpid.test.unit.xa.FaultTest#testForget + +// the 0-10 c++ broker does not implement priority / this test depends on a Java broker extension for queue creation +org.apache.qpid.server.queue.PriorityTest + +//this test checks explicitly for 0-8 flow control semantics +org.apache.qpid.test.client.FlowControlTest + +// 0-10 c++ broker doesn't implement virtual hosts, or those wackhy exchanges +org.apache.qpid.test.unit.client.connection.ConnectionTest#testUnresolvedVirtualHostFailure +org.apache.qpid.test.unit.client.connection.ConnectionTest#testDefaultExchanges + +// 0-10 c++ broker in cpp.testprofile is started with no auth so won't pass this test +org.apache.qpid.test.unit.client.connection.ConnectionTest#testPasswordFailureConnection + +// c++ broker doesn't do selectors, so this will fail +org.apache.qpid.test.unit.topic.TopicSessionTest#testNonMatchingMessagesDoNotFillQueue + +// InVM Broker tests +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* + +// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue. +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* + +// c++ broker doesn't support priorities, TTL or message bouncing +org.apache.qpid.server.exchange.ReturnUnroutableMandatoryMessageTest#* +org.apache.qpid.server.queue.PriorityTest#* +org.apache.qpid.server.queue.TimeToLiveTest#* + +// QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on transient queues. Also it requries a persistent store impl. for Apache +org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#* + +// This test currently does not pick up the runtime location of the nonVm queueBacking store. +org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* + +// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM +org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* + +//QPID-1818 : 0-10 Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// QPID-1730: the C++ server has a totally different logging mechanism. We should split this file differently +org.apache.qpid.server.AlertingTest#* + +// The C++ server has a totally different persistence mechanism +org.apache.qpid.server.store.PersistentStoreTest#* + +// QPID-1225 : Temporary remove this test until the problem has been addressed +org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess + diff --git a/java/test-profiles/010PrefetchExcludes b/java/test-profiles/010PrefetchExcludes new file mode 100644 index 0000000000..6b0014b917 --- /dev/null +++ b/java/test-profiles/010PrefetchExcludes @@ -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 diff --git a/java/test-profiles/010TransientExcludes b/java/test-profiles/010TransientExcludes new file mode 100644 index 0000000000..90b4251807 --- /dev/null +++ b/java/test-profiles/010TransientExcludes @@ -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 diff --git a/java/test-profiles/08ExcludeList b/java/test-profiles/08ExcludeList deleted file mode 100644 index 0866694854..0000000000 --- a/java/test-profiles/08ExcludeList +++ /dev/null @@ -1,17 +0,0 @@ -org.apache.qpid.test.unit.ct.DurableSubscriberTests#* -// Those tests are not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover -// Those tests are written against the 0.10 path -org.apache.qpid.test.unit.message.UTF8Test#* -org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait - -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* - -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - -org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08ExcludeList-nonvm b/java/test-profiles/08ExcludeList-nonvm deleted file mode 100644 index e697201bfd..0000000000 --- a/java/test-profiles/08ExcludeList-nonvm +++ /dev/null @@ -1,42 +0,0 @@ -org.apache.qpid.test.unit.ct.DurableSubscriberTests#* -// Those tests are not finished -org.apache.qpid.test.testcases.TTLTest#* -org.apache.qpid.test.testcases.FailoverTest#* -// This is a long running test so should exclude from normal runs -org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover -// Those tests require failover support -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated -org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser -org.apache.qpid.test.testcases.FailoverTest#* -org.apache.qpid.test.client.failover.FailoverTest#* - -// InVM Broker tests awaiting resolution of QPID-1103 -org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* -org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* -org.apache.qpid.server.security.acl.SimpleACLTest#* - -// Those tests are written against the 0.10 path -org.apache.qpid.test.unit.message.UTF8Test#* -org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait - -// This test currently does not pick up the runtime location of the nonVm queueBacking store. -org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* - -// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM -org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* -//QPID-1818 : Client code path does not correctly restore a transacted session after failover. -org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* -// QPID-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - -org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08ExcludeList-nopersistence b/java/test-profiles/08ExcludeList-nopersistence deleted file mode 100644 index f81e9c213c..0000000000 --- a/java/test-profiles/08ExcludeList-nopersistence +++ /dev/null @@ -1 +0,0 @@ -org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/test-profiles/08Excludes b/java/test-profiles/08Excludes new file mode 100644 index 0000000000..0866694854 --- /dev/null +++ b/java/test-profiles/08Excludes @@ -0,0 +1,17 @@ +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover +// Those tests are written against the 0.10 path +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait + +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* + +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08StandaloneExcludes b/java/test-profiles/08StandaloneExcludes new file mode 100644 index 0000000000..e697201bfd --- /dev/null +++ b/java/test-profiles/08StandaloneExcludes @@ -0,0 +1,42 @@ +org.apache.qpid.test.unit.ct.DurableSubscriberTests#* +// Those tests are not finished +org.apache.qpid.test.testcases.TTLTest#* +org.apache.qpid.test.testcases.FailoverTest#* +// This is a long running test so should exclude from normal runs +org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover +// Those tests require failover support +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserAutoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserClientAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserDupsOkTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserNoAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserPreAckTest#testFailoverWithQueueBrowser +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowserCreated +org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser +org.apache.qpid.test.testcases.FailoverTest#* +org.apache.qpid.test.client.failover.FailoverTest#* + +// InVM Broker tests awaiting resolution of QPID-1103 +org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#* +org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#* +org.apache.qpid.server.security.acl.SimpleACLTest#* + +// Those tests are written against the 0.10 path +org.apache.qpid.test.unit.message.UTF8Test#* +org.apache.qpid.client.MessageListenerTest#testSynchronousRecieveNoWait + +// This test currently does not pick up the runtime location of the nonVm queueBacking store. +org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#* + +// This test may use QpidTestCase but it is not using the getConnection and is hardwired to InVM +org.apache.qpid.test.unit.client.connection.CloseAfterConnectionFailureTest#* +//QPID-1818 : Client code path does not correctly restore a transacted session after failover. +org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#* +// QPID-1823: this takes ages to run +org.apache.qpid.client.SessionCreateTest#* + +org.apache.qpid.test.client.RollbackOrderTest#* diff --git a/java/test-profiles/08TransientExcludes b/java/test-profiles/08TransientExcludes new file mode 100644 index 0000000000..f81e9c213c --- /dev/null +++ b/java/test-profiles/08TransientExcludes @@ -0,0 +1 @@ +org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/test-profiles/ExcludeList b/java/test-profiles/ExcludeList deleted file mode 100644 index a3a61b51db..0000000000 --- a/java/test-profiles/ExcludeList +++ /dev/null @@ -1,7 +0,0 @@ -org.apache.qpid.client.MultipleJCAProviderRegistrationTest#test -// QPID-1715, QPID-1715 : Client Error Handling on close is still broken -org.apache.qpid.server.queue.QueueCreateTest#testCreatePriorityString -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskValidNoSize -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalid -org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalidSize - diff --git a/java/test-profiles/Excludes b/java/test-profiles/Excludes new file mode 100644 index 0000000000..a3a61b51db --- /dev/null +++ b/java/test-profiles/Excludes @@ -0,0 +1,7 @@ +org.apache.qpid.client.MultipleJCAProviderRegistrationTest#test +// QPID-1715, QPID-1715 : Client Error Handling on close is still broken +org.apache.qpid.server.queue.QueueCreateTest#testCreatePriorityString +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskValidNoSize +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalid +org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalidSize + diff --git a/java/test-profiles/XAExcludeList b/java/test-profiles/XAExcludeList deleted file mode 100644 index 1bb26c5f27..0000000000 --- a/java/test-profiles/XAExcludeList +++ /dev/null @@ -1,3 +0,0 @@ -org.apache.qpid.test.unit.xa.QueueTest#* -org.apache.qpid.test.unit.xa.TopicTest#* -org.apache.qpid.test.unit.xa.FaultTest#* diff --git a/java/test-profiles/XAExcludes b/java/test-profiles/XAExcludes new file mode 100644 index 0000000000..1bb26c5f27 --- /dev/null +++ b/java/test-profiles/XAExcludes @@ -0,0 +1,3 @@ +org.apache.qpid.test.unit.xa.QueueTest#* +org.apache.qpid.test.unit.xa.TopicTest#* +org.apache.qpid.test.unit.xa.FaultTest#* diff --git a/java/test-profiles/cpp.async.excludes b/java/test-profiles/cpp.async.excludes deleted file mode 100644 index 6b0014b917..0000000000 --- a/java/test-profiles/cpp.async.excludes +++ /dev/null @@ -1,4 +0,0 @@ -// 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 diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index d95b1237fa..f06b56fbad 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -1,2 +1,3 @@ include=cpp +profile.excludes=010PrefetchExcludes broker.modules=--load-module ${broker.module.store} diff --git a/java/test-profiles/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile index b241bd4f8b..143e0d88d0 100644 --- a/java/test-profiles/cpp.cluster.testprofile +++ b/java/test-profiles/cpp.cluster.testprofile @@ -2,7 +2,7 @@ include=cpp 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 diff --git a/java/test-profiles/cpp.excludes b/java/test-profiles/cpp.excludes deleted file mode 100644 index 65ce051481..0000000000 --- a/java/test-profiles/cpp.excludes +++ /dev/null @@ -1,15 +0,0 @@ -// 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 - -// 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 diff --git a/java/test-profiles/cpp.noprefetch.excludes b/java/test-profiles/cpp.noprefetch.excludes deleted file mode 100644 index 90b4251807..0000000000 --- a/java/test-profiles/cpp.noprefetch.excludes +++ /dev/null @@ -1,10 +0,0 @@ -// 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 diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile index 4c8c827e30..b2b9bc6de3 100644 --- a/java/test-profiles/cpp.noprefetch.testprofile +++ b/java/test-profiles/cpp.noprefetch.testprofile @@ -1,3 +1,3 @@ include=cpp -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch +profile.excludes=010TransientExcludes max_prefetch=0 diff --git a/java/test-profiles/cpp.testprofile b/java/test-profiles/cpp.testprofile index 0febcdb328..1d5416fe19 100644 --- a/java/test-profiles/cpp.testprofile +++ b/java/test-profiles/cpp.testprofile @@ -14,4 +14,5 @@ broker.args= 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} diff --git a/java/test-profiles/default-longrunning.testprofile b/java/test-profiles/default-longrunning.testprofile deleted file mode 100644 index bf24e4f9da..0000000000 --- a/java/test-profiles/default-longrunning.testprofile +++ /dev/null @@ -1 +0,0 @@ -test.includesfile=${test.profiles}/08LongRunningList diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile index 80d2e6a8a4..5a08b79e10 100644 --- a/java/test-profiles/default.testprofile +++ b/java/test-profiles/default.testprofile @@ -20,8 +20,9 @@ test.port=15672 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 diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile index 1786e96712..52b63ae799 100644 --- a/java/test-profiles/java-derby.testprofile +++ b/java/test-profiles/java-derby.testprofile @@ -4,4 +4,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work 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 diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile index d1e4c12bc1..f920124735 100644 --- a/java/test-profiles/java.testprofile +++ b/java/test-profiles/java.testprofile @@ -3,4 +3,4 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE 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 -- cgit v1.2.1