Repository: activemq Updated Branches: refs/heads/master 9a35c3731 -> fc9ad9f02
tackle intermittent ci failure, think possibe all messages are dispatched before pause Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/fc9ad9f0 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/fc9ad9f0 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/fc9ad9f0 Branch: refs/heads/master Commit: fc9ad9f02364c627b99164ffc7114ae347d0db8d Parents: 9a35c37 Author: gtully <[email protected]> Authored: Fri May 6 12:17:07 2016 +0100 Committer: gtully <[email protected]> Committed: Fri May 6 12:17:07 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/activemq/transport/SoWriteTimeoutTest.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/fc9ad9f0/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java index 6f05658..81e5391 100644 --- a/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java +++ b/activemq-unit-tests/src/test/java/org/apache/activemq/transport/SoWriteTimeoutTest.java @@ -120,11 +120,7 @@ public class SoWriteTimeoutTest extends JmsTestSupport { frame = "SUBSCRIBE\n" + "destination:/queue/" + dest.getQueueName() + "\n" + "ack:client\n\n" + Stomp.NULL; stompConnection.sendFrame(frame); - - // ensure dispatch has started before pause - frame = stompConnection.receiveFrame(); - assertTrue(frame.startsWith("MESSAGE")); - + proxy.pause(); // writes should back up... writeTimeout will kick in a abort the connection
