From a65b4b105a295807e8490a817557f1ecee10e691 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 8 Dec 2009 11:42:59 +0000 Subject: Updated exclude files to aline with the broker they work with. The CPPExcludes file needs to be split in to a 010Excludes file so that the CPPExclude only contains test the CPP broker should not run and the 010Exclude contains tests that any 0-10 broker should exclude. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@888347 13f79535-47bb-0310-9956-ffa450edef68 --- java/test-profiles/010Excludes | 111 -------------------------- java/test-profiles/010PrefetchExcludes | 4 - java/test-profiles/010TransientExcludes | 10 --- java/test-profiles/08Excludes | 20 ----- java/test-profiles/08InVMExcludes | 9 --- java/test-profiles/08StandaloneExcludes | 48 ++--------- java/test-profiles/08TransientExcludes | 1 - java/test-profiles/CPPExcludes | 111 ++++++++++++++++++++++++++ java/test-profiles/CPPPrefetchExcludes | 4 + java/test-profiles/CPPTransientExcludes | 10 +++ java/test-profiles/JavaExcludes | 20 +++++ java/test-profiles/JavaInVMExcludes | 9 +++ java/test-profiles/JavaStandaloneExcludes | 44 ++++++++++ java/test-profiles/JavaTransientExcludes | 1 + java/test-profiles/cpp.async.testprofile | 2 +- java/test-profiles/cpp.cluster.testprofile | 2 +- java/test-profiles/cpp.noprefetch.testprofile | 2 +- java/test-profiles/default.testprofile | 4 +- java/test-profiles/java-derby.testprofile | 2 +- java/test-profiles/java.0.10.testprofile | 2 +- java/test-profiles/java.testprofile | 2 +- 21 files changed, 212 insertions(+), 206 deletions(-) delete mode 100755 java/test-profiles/010Excludes delete mode 100644 java/test-profiles/010PrefetchExcludes delete mode 100644 java/test-profiles/010TransientExcludes delete mode 100644 java/test-profiles/08Excludes delete mode 100644 java/test-profiles/08InVMExcludes delete mode 100644 java/test-profiles/08TransientExcludes create mode 100755 java/test-profiles/CPPExcludes create mode 100644 java/test-profiles/CPPPrefetchExcludes create mode 100644 java/test-profiles/CPPTransientExcludes create mode 100644 java/test-profiles/JavaExcludes create mode 100644 java/test-profiles/JavaInVMExcludes create mode 100644 java/test-profiles/JavaStandaloneExcludes create mode 100644 java/test-profiles/JavaTransientExcludes mode change 100755 => 100644 java/test-profiles/java.0.10.testprofile (limited to 'java/test-profiles') diff --git a/java/test-profiles/010Excludes b/java/test-profiles/010Excludes deleted file mode 100755 index cb72da2a88..0000000000 --- a/java/test-profiles/010Excludes +++ /dev/null @@ -1,111 +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.security.firewall.FirewallConfigTest#* -org.apache.qpid.server.plugins.PluginTest#* -org.apache.qpid.server.BrokerStartupTest#* - -// 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#* - -// CPP Broker does not follow the same Logging convention as the Java broker -org.apache.qpid.server.logging.* - -// CPP Broker does not have a JMX interface to test -org.apache.qpid.management.jmx.* -// JMX is used in this test for validation -org.apache.qpid.server.queue.ModelTest#* - - -// 0-10 is not supported by the MethodRegistry -org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#* - -// QPID-2084 : this test needs more work for 0-10 -org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#* - -// QPID-2118 : 0-10 Java client has differrent error handling to 0-8 code path -org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError - -//QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Java Broker (not in CPP Broker) -org.apache.qpid.server.queue.ProducerFlowControlTest#* - -//QPID-1950 : Commit to test this failure. This is a MINA only failure so it cannot be tested when using 010. -org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* - -// These are recent test additions that are failing with the c++ broker -// Temporarily disabling until properly investigated. -org.apache.qpid.test.unit.publish.DirtyTrasactedPubilshTest#* -org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#* -org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#* -org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#* - -org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#* - diff --git a/java/test-profiles/010PrefetchExcludes b/java/test-profiles/010PrefetchExcludes deleted file mode 100644 index 6b0014b917..0000000000 --- a/java/test-profiles/010PrefetchExcludes +++ /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/010TransientExcludes b/java/test-profiles/010TransientExcludes deleted file mode 100644 index 90b4251807..0000000000 --- a/java/test-profiles/010TransientExcludes +++ /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/08Excludes b/java/test-profiles/08Excludes deleted file mode 100644 index 6f3898384d..0000000000 --- a/java/test-profiles/08Excludes +++ /dev/null @@ -1,20 +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#* - -// QPID-2097 exclude it from the InVM test runs until InVM JMX Interface is reliable -org.apache.qpid.management.jmx.ManagementActorLoggingTest#* -org.apache.qpid.server.queue.ModelTest#* - diff --git a/java/test-profiles/08InVMExcludes b/java/test-profiles/08InVMExcludes deleted file mode 100644 index 915c1ff0c2..0000000000 --- a/java/test-profiles/08InVMExcludes +++ /dev/null @@ -1,9 +0,0 @@ -//====================================================================== -//Exclude the following tests when running the InVM default test profile -//====================================================================== - -// QPID-2097 exclude until InVM JMX test runs are reliable -org.apache.qpid.server.queue.ProducerFlowControlTest#testFlowControlAttributeModificationViaJMX - -// This test requires a broker capable of 0-8/9 and 0-10 -org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend diff --git a/java/test-profiles/08StandaloneExcludes b/java/test-profiles/08StandaloneExcludes index ed12973498..f06bfca1ac 100644 --- a/java/test-profiles/08StandaloneExcludes +++ b/java/test-profiles/08StandaloneExcludes @@ -1,44 +1,6 @@ -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#* - -// 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#* - -// This test requires the standard configuration file for validation. -// Excluding here does not reduce test coverage. -org.apache.qpid.server.configuration.ServerConfigurationFileTest#* +//====================================================================== +//Exclude the following from brokers defaulting to the 0-8 protocol +//====================================================================== +// This test requires a broker capable of 0-8/9 and 0-10 +org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend diff --git a/java/test-profiles/08TransientExcludes b/java/test-profiles/08TransientExcludes deleted file mode 100644 index f81e9c213c..0000000000 --- a/java/test-profiles/08TransientExcludes +++ /dev/null @@ -1 +0,0 @@ -org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/test-profiles/CPPExcludes b/java/test-profiles/CPPExcludes new file mode 100755 index 0000000000..cb72da2a88 --- /dev/null +++ b/java/test-profiles/CPPExcludes @@ -0,0 +1,111 @@ +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.security.firewall.FirewallConfigTest#* +org.apache.qpid.server.plugins.PluginTest#* +org.apache.qpid.server.BrokerStartupTest#* + +// 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#* + +// CPP Broker does not follow the same Logging convention as the Java broker +org.apache.qpid.server.logging.* + +// CPP Broker does not have a JMX interface to test +org.apache.qpid.management.jmx.* +// JMX is used in this test for validation +org.apache.qpid.server.queue.ModelTest#* + + +// 0-10 is not supported by the MethodRegistry +org.apache.qpid.test.unit.close.JavaServerCloseRaceConditionTest#* + +// QPID-2084 : this test needs more work for 0-10 +org.apache.qpid.test.unit.client.DynamicQueueExchangeCreateTest#* + +// QPID-2118 : 0-10 Java client has differrent error handling to 0-8 code path +org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError + +//QPID-942 : Implemented Channel.Flow based Producer Side flow control to the Java Broker (not in CPP Broker) +org.apache.qpid.server.queue.ProducerFlowControlTest#* + +//QPID-1950 : Commit to test this failure. This is a MINA only failure so it cannot be tested when using 010. +org.apache.qpid.server.failover.MessageDisappearWithIOExceptionTest#* + +// These are recent test additions that are failing with the c++ broker +// Temporarily disabling until properly investigated. +org.apache.qpid.test.unit.publish.DirtyTrasactedPubilshTest#* +org.apache.qpid.test.unit.ack.FailoverBeforeConsumingRecoverTest#* +org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverTest#* +org.apache.qpid.test.unit.ack.AcknowledgeAfterFailoverOnMessageTest#* + +org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#* + diff --git a/java/test-profiles/CPPPrefetchExcludes b/java/test-profiles/CPPPrefetchExcludes new file mode 100644 index 0000000000..6b0014b917 --- /dev/null +++ b/java/test-profiles/CPPPrefetchExcludes @@ -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/CPPTransientExcludes b/java/test-profiles/CPPTransientExcludes new file mode 100644 index 0000000000..90b4251807 --- /dev/null +++ b/java/test-profiles/CPPTransientExcludes @@ -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/JavaExcludes b/java/test-profiles/JavaExcludes new file mode 100644 index 0000000000..6f3898384d --- /dev/null +++ b/java/test-profiles/JavaExcludes @@ -0,0 +1,20 @@ +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#* + +// QPID-2097 exclude it from the InVM test runs until InVM JMX Interface is reliable +org.apache.qpid.management.jmx.ManagementActorLoggingTest#* +org.apache.qpid.server.queue.ModelTest#* + diff --git a/java/test-profiles/JavaInVMExcludes b/java/test-profiles/JavaInVMExcludes new file mode 100644 index 0000000000..915c1ff0c2 --- /dev/null +++ b/java/test-profiles/JavaInVMExcludes @@ -0,0 +1,9 @@ +//====================================================================== +//Exclude the following tests when running the InVM default test profile +//====================================================================== + +// QPID-2097 exclude until InVM JMX test runs are reliable +org.apache.qpid.server.queue.ProducerFlowControlTest#testFlowControlAttributeModificationViaJMX + +// This test requires a broker capable of 0-8/9 and 0-10 +org.apache.qpid.test.client.message.JMSDestinationTest#testReceiveResend diff --git a/java/test-profiles/JavaStandaloneExcludes b/java/test-profiles/JavaStandaloneExcludes new file mode 100644 index 0000000000..ed12973498 --- /dev/null +++ b/java/test-profiles/JavaStandaloneExcludes @@ -0,0 +1,44 @@ +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#* + +// 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#* + +// This test requires the standard configuration file for validation. +// Excluding here does not reduce test coverage. +org.apache.qpid.server.configuration.ServerConfigurationFileTest#* + diff --git a/java/test-profiles/JavaTransientExcludes b/java/test-profiles/JavaTransientExcludes new file mode 100644 index 0000000000..f81e9c213c --- /dev/null +++ b/java/test-profiles/JavaTransientExcludes @@ -0,0 +1 @@ +org.apache.qpid.server.store.PersistentStoreTest#* diff --git a/java/test-profiles/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile index f06b56fbad..ac8b98471e 100644 --- a/java/test-profiles/cpp.async.testprofile +++ b/java/test-profiles/cpp.async.testprofile @@ -1,3 +1,3 @@ include=cpp -profile.excludes=010PrefetchExcludes +profile.excludes=CPPPrefetchExcludes broker.modules=--load-module ${broker.module.store} diff --git a/java/test-profiles/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile index 143e0d88d0..4bfd4f69a2 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 -profile.excludes=XAExcludes 010PrefetchExcludes 010TransientExcludes +profile.excludes=XAExcludes CPPPrefetchExcludes CPPTransientExcludes profile.clustered=true profile.failoverMsgCount=10 diff --git a/java/test-profiles/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile index b2b9bc6de3..304671a4a4 100644 --- a/java/test-profiles/cpp.noprefetch.testprofile +++ b/java/test-profiles/cpp.noprefetch.testprofile @@ -1,3 +1,3 @@ include=cpp -profile.excludes=010TransientExcludes +profile.excludes=CPPTransientExcludes max_prefetch=0 diff --git a/java/test-profiles/default.testprofile b/java/test-profiles/default.testprofile index c28e4c5747..91727304ae 100644 --- a/java/test-profiles/default.testprofile +++ b/java/test-profiles/default.testprofile @@ -27,8 +27,8 @@ test.port.alt=25672 test.port.alt.ssl=25671 test.exclude=true -profile.excludes=08TransientExcludes 08InVMExcludes -test.excludes=Excludes XAExcludes 08Excludes ${profile}.excludes ${profile.excludes} +profile.excludes=JavaTransientExcludes JavaInVMExcludes +test.excludes=Excludes XAExcludes JavaExcludes ${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 2887501a9b..689b2b4357 100644 --- a/java/test-profiles/java-derby.testprofile +++ b/java/test-profiles/java-derby.testprofile @@ -5,4 +5,4 @@ broker.ready=BRK-1004 broker.stopped=Exception broker.config=${project.root}/build/etc/config-systests-derby.xml qpid.amqp.version=0-9 -profile.excludes=08StandaloneExcludes +profile.excludes=JavaStandaloneExcludes diff --git a/java/test-profiles/java.0.10.testprofile b/java/test-profiles/java.0.10.testprofile old mode 100755 new mode 100644 index 35e3530cab..64c184c0f6 --- a/java/test-profiles/java.0.10.testprofile +++ b/java/test-profiles/java.0.10.testprofile @@ -5,4 +5,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception -profile.excludes=08TransientExcludes 08StandaloneExcludes 010Excludes 010TransientExcludes +profile.excludes=JavaTransientExcludes JavaStandaloneExcludes CPPExcludes CPPTransientExcludes diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile index 8dd835a335..a301fb1b65 100644 --- a/java/test-profiles/java.testprofile +++ b/java/test-profiles/java.testprofile @@ -4,4 +4,4 @@ broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work broker.ready=BRK-1004 broker.stopped=Exception qpid.amqp.version=0-9 -profile.excludes=08TransientExcludes 08StandaloneExcludes +profile.excludes=JavaTransientExcludes JavaStandaloneExcludes 08StandaloneExcludes -- cgit v1.2.1