diff options
| -rw-r--r-- | qpid/java/test-profiles/010ExcludeList | 34 | ||||
| -rw-r--r-- | qpid/java/test-profiles/010ExcludeList-noPrefetch | 61 | ||||
| -rw-r--r-- | qpid/java/test-profiles/010ExcludeList-store | 64 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.async.excludes | 4 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.async.testprofile | 3 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.cluster.testprofile | 2 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.excludes | 15 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.noprefetch.excludes | 10 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.ssl.excludes (renamed from qpid/java/test-profiles/010ExcludeList-ssl) | 0 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.ssl.testprofile | 3 | ||||
| -rw-r--r-- | qpid/java/test-profiles/cpp.testprofile | 2 |
11 files changed, 47 insertions, 151 deletions
diff --git a/qpid/java/test-profiles/010ExcludeList b/qpid/java/test-profiles/010ExcludeList index ca12a4f8a5..69077a97c8 100644 --- a/qpid/java/test-profiles/010ExcludeList +++ b/qpid/java/test-profiles/010ExcludeList @@ -1,24 +1,14 @@ org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* org.apache.qpid.client.ResetMessageListenerTest#* -// 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 + //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 @@ -35,29 +25,37 @@ org.apache.qpid.test.testcases.MandatoryMessageTest#test_QPID_508_MandatoryFails 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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess + // 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#* @@ -70,12 +68,12 @@ 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-1823: this takes ages to run -org.apache.qpid.client.SessionCreateTest#* - // 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/qpid/java/test-profiles/010ExcludeList-noPrefetch b/qpid/java/test-profiles/010ExcludeList-noPrefetch deleted file mode 100644 index dca931b55b..0000000000 --- a/qpid/java/test-profiles/010ExcludeList-noPrefetch +++ /dev/null @@ -1,61 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* -org.apache.qpid.test.unit.transacted.TransactedTest#testRollback -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector -// This test cannot be run with no-prefetch -org.apache.qpid.test.unit.xa.TopicTest#testMultiMessagesDurSubCrash -//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#* -// 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#* -// 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 -// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. -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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess - -// 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#* diff --git a/qpid/java/test-profiles/010ExcludeList-store b/qpid/java/test-profiles/010ExcludeList-store deleted file mode 100644 index d4bc8b7b71..0000000000 --- a/qpid/java/test-profiles/010ExcludeList-store +++ /dev/null @@ -1,64 +0,0 @@ -org.apache.qpid.test.unit.client.channelclose.ChannelCloseTest#* -org.apache.qpid.client.ResetMessageListenerTest#* -// 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#testMultiMessagesDurSubCrash -org.apache.qpid.test.unit.xa.TopicTest#testMigrateDurableSubscriber -org.apache.qpid.test.unit.ack.AcknowledgeTest#* -// those tests need durable subscribe states to be persisted -org.apache.qpid.test.unit.topic.DurableSubscriptionTest#testDurSubRestoredAfterNonPersistentMessageSent -org.apache.qpid.test.unit.ct.DurableSubscriberTest#testDurSubRestoresMessageSelector -//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#* -// 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#* -// 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 -// The default cpp.testprofile does not start the cpp broker with authentication so this test will fail. -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 -// QPID-1225 : Temporary remove this test until the problem has been addressed -org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess - -// 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#* diff --git a/qpid/java/test-profiles/cpp.async.excludes b/qpid/java/test-profiles/cpp.async.excludes new file mode 100644 index 0000000000..6b0014b917 --- /dev/null +++ b/qpid/java/test-profiles/cpp.async.excludes @@ -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/qpid/java/test-profiles/cpp.async.testprofile b/qpid/java/test-profiles/cpp.async.testprofile index 5b6834e8c0..d95b1237fa 100644 --- a/qpid/java/test-profiles/cpp.async.testprofile +++ b/qpid/java/test-profiles/cpp.async.testprofile @@ -1,5 +1,2 @@ include=cpp - broker.modules=--load-module ${broker.module.store} - -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store diff --git a/qpid/java/test-profiles/cpp.cluster.testprofile b/qpid/java/test-profiles/cpp.cluster.testprofile index 49ddc98f4f..b241bd4f8b 100644 --- a/qpid/java/test-profiles/cpp.cluster.testprofile +++ b/qpid/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}/XAExcludeList ${test.profiles}/010ExcludeList +test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/XAExcludeList profile.clustered=true profile.failoverMsgCount=10 diff --git a/qpid/java/test-profiles/cpp.excludes b/qpid/java/test-profiles/cpp.excludes new file mode 100644 index 0000000000..65ce051481 --- /dev/null +++ b/qpid/java/test-profiles/cpp.excludes @@ -0,0 +1,15 @@ +// 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/qpid/java/test-profiles/cpp.noprefetch.excludes b/qpid/java/test-profiles/cpp.noprefetch.excludes new file mode 100644 index 0000000000..90b4251807 --- /dev/null +++ b/qpid/java/test-profiles/cpp.noprefetch.excludes @@ -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/qpid/java/test-profiles/010ExcludeList-ssl b/qpid/java/test-profiles/cpp.ssl.excludes index bf21ab9cc7..bf21ab9cc7 100644 --- a/qpid/java/test-profiles/010ExcludeList-ssl +++ b/qpid/java/test-profiles/cpp.ssl.excludes diff --git a/qpid/java/test-profiles/cpp.ssl.testprofile b/qpid/java/test-profiles/cpp.ssl.testprofile index 08d4fd895a..9f2581a83a 100644 --- a/qpid/java/test-profiles/cpp.ssl.testprofile +++ b/qpid/java/test-profiles/cpp.ssl.testprofile @@ -2,9 +2,6 @@ include=cpp broker.modules=--load-module ${broker.module.ssl} --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --ssl-port @SSL_PORT -test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl -test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#* - profile.use_ssl=true broker.ready= Listening for SSL connections diff --git a/qpid/java/test-profiles/cpp.testprofile b/qpid/java/test-profiles/cpp.testprofile index 414e364ecc..0febcdb328 100644 --- a/qpid/java/test-profiles/cpp.testprofile +++ b/qpid/java/test-profiles/cpp.testprofile @@ -14,4 +14,4 @@ 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.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/${profile}.excludes |