You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ta...@apache.org on 2017/02/28 16:30:07 UTC
qpid-jms git commit: QPIDJMS-267 Attempt to fix intermittently
failing tests
Repository: qpid-jms
Updated Branches:
refs/heads/master 2954fe81f -> 72efc6992
QPIDJMS-267 Attempt to fix intermittently failing tests
Force the reconnect using a more predictable strategy of remotely
closing the connection.
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/72efc699
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/72efc699
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/72efc699
Branch: refs/heads/master
Commit: 72efc69927c885272a1a23e40c5adcc8275250ff
Parents: 2954fe8
Author: Timothy Bish <ta...@gmail.com>
Authored: Tue Feb 28 11:29:52 2017 -0500
Committer: Timothy Bish <ta...@gmail.com>
Committed: Tue Feb 28 11:29:52 2017 -0500
----------------------------------------------------------------------
...qpOpenProvidedServerListIntegrationTest.java | 33 ++++++++++++++++++++
1 file changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/72efc699/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverWithAmqpOpenProvidedServerListIntegrationTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverWithAmqpOpenProvidedServerListIntegrationTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverWithAmqpOpenProvidedServerListIntegrationTest.java
index 4490727..81447bf 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverWithAmqpOpenProvidedServerListIntegrationTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/provider/failover/FailoverWithAmqpOpenProvidedServerListIntegrationTest.java
@@ -40,6 +40,7 @@ import org.apache.qpid.jms.JmsConnectionFactory;
import org.apache.qpid.jms.JmsDefaultConnectionListener;
import org.apache.qpid.jms.test.QpidJmsTestCase;
import org.apache.qpid.jms.test.testpeer.TestAmqpPeer;
+import org.apache.qpid.jms.test.testpeer.basictypes.AmqpError;
import org.apache.qpid.jms.transports.TransportSslOptions;
import org.apache.qpid.jms.transports.TransportSupport;
import org.apache.qpid.jms.util.PropertyUtil;
@@ -480,7 +481,15 @@ public class FailoverWithAmqpOpenProvidedServerListIntegrationTest extends QpidJ
backupPeer.expectSaslAnonymous();
backupPeer.expectOpen();
backupPeer.expectBegin();
+ backupPeer.expectBegin();
+
+ // Create a predictable connection drop condition
+ primaryPeer.expectBegin();
+ primaryPeer.remotelyCloseConnection(true, AmqpError.INTERNAL_ERROR, "Remote is going down");
+
+ connection.createSession();
+ primaryPeer.waitForAllHandlersToComplete(100);
primaryPeer.close();
assertTrue("Should connect to backup peer", connectedToBackup.await(5, TimeUnit.SECONDS));
@@ -590,7 +599,15 @@ public class FailoverWithAmqpOpenProvidedServerListIntegrationTest extends QpidJ
backupPeer.expectSaslAnonymous();
backupPeer.expectOpen();
backupPeer.expectBegin();
+ backupPeer.expectBegin();
+
+ // Create a predictable connection drop condition
+ primaryPeer.expectBegin();
+ primaryPeer.remotelyCloseConnection(true, AmqpError.INTERNAL_ERROR, "Remote is going down");
+
+ connection.createSession();
+ primaryPeer.waitForAllHandlersToComplete(100);
primaryPeer.close();
assertTrue("Should connect to backup peer", connectedToBackup.await(5, TimeUnit.SECONDS));
@@ -701,7 +718,15 @@ public class FailoverWithAmqpOpenProvidedServerListIntegrationTest extends QpidJ
backupPeer.expectSaslAnonymous();
backupPeer.expectOpen();
backupPeer.expectBegin();
+ backupPeer.expectBegin();
+
+ // Create a predictable connection drop condition
+ primaryPeer.expectBegin();
+ primaryPeer.remotelyCloseConnection(true, AmqpError.INTERNAL_ERROR, "Remote is going down");
+
+ connection.createSession();
+ primaryPeer.waitForAllHandlersToComplete(100);
primaryPeer.close();
assertTrue("Should connect to backup peer", connectedToBackup.await(5, TimeUnit.SECONDS));
@@ -817,7 +842,15 @@ public class FailoverWithAmqpOpenProvidedServerListIntegrationTest extends QpidJ
backupPeer.expectSaslAnonymous();
backupPeer.expectOpen();
backupPeer.expectBegin();
+ backupPeer.expectBegin();
+
+ // Create a predictable connection drop condition
+ primaryPeer.expectBegin();
+ primaryPeer.remotelyCloseConnection(true, AmqpError.INTERNAL_ERROR, "Remote is going down");
+
+ connection.createSession();
+ primaryPeer.waitForAllHandlersToComplete(100);
primaryPeer.close();
assertTrue("Should connect to backup peer", connectedToBackup.await(5, TimeUnit.SECONDS));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org