summaryrefslogtreecommitdiff
path: root/qpid/java
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-05-29 23:49:29 +0000
committerRobert Gemmell <robbie@apache.org>2012-05-29 23:49:29 +0000
commit94084695b52a31cd74742485195d83e994e5f63c (patch)
treebe446ca483f1ad56eeaeb566e2d34205c940ffc2 /qpid/java
parent4e82caaece6d7b1626edc0b0913d45cad8771596 (diff)
downloadqpid-python-94084695b52a31cd74742485195d83e994e5f63c.tar.gz
QPID-4009, QPID-4017: exclude new 0-8/0-9/0-9-1 and/or Java broker specific tests from the CPP test profile to resolve the CI failures
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1344052 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
-rw-r--r--qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java7
-rwxr-xr-xqpid/java/test-profiles/CPPExcludes5
2 files changed, 12 insertions, 0 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
index 62b6c784e2..cb13ad0f1c 100644
--- a/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
+++ b/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
@@ -836,6 +836,13 @@ public class FailoverBehaviourTest extends FailoverBaseCase implements Connectio
}
}
}
+
+ /**
+ * Tests that the producer flow control flag is reset when failover occurs while
+ * the producers are being blocked by the broker.
+ *
+ * Uses Java broker specific queue configuration to enabled PSFC.
+ */
public void testFlowControlFlagResetOnFailover() throws Exception
{
// we do not need the connection failing to second broker
diff --git a/qpid/java/test-profiles/CPPExcludes b/qpid/java/test-profiles/CPPExcludes
index 3fb6b63b6f..23722ae5cd 100755
--- a/qpid/java/test-profiles/CPPExcludes
+++ b/qpid/java/test-profiles/CPPExcludes
@@ -123,6 +123,11 @@ org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
org.apache.qpid.server.queue.ProducerFlowControlTest#*
//QPID-3986 : Flow control invoked on total store disk usage
org.apache.qpid.server.store.StoreOverfullTest#*
+// 0-8/0-9/0-9-1 and/or Java broker specific failover tests related to the above Producer Flow Control mechanisms
+org.apache.qpid.client.failover.FailoverBehaviourTest#testFailoverHandlerTimeoutExpires
+org.apache.qpid.client.failover.FailoverBehaviourTest#testFlowControlFlagResetOnFailover
+org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFailoverHandlerTimeoutExpires
+org.apache.qpid.client.failover.AddressBasedFailoverBehaviourTest#testFlowControlFlagResetOnFailover
org.apache.qpid.test.client.RollbackOrderTest#testOrderingAfterRollbackOnMessage#*