You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/06/13 16:25:06 UTC
qpid-broker-j git commit: NO-JIRA: [Broker-J][Protocol Test AMQP
0-10] Fix sporadically failing ConnectionTest#heartbeatingIncomingIdle
Repository: qpid-broker-j
Updated Branches:
refs/heads/master f4196afe7 -> ec957a270
NO-JIRA: [Broker-J][Protocol Test AMQP 0-10] Fix sporadically failing ConnectionTest#heartbeatingIncomingIdle
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/ec957a27
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ec957a27
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ec957a27
Branch: refs/heads/master
Commit: ec957a270c2218e962c8e723dbd77e5657e7e0ff
Parents: f4196af
Author: Alex Rudyy <or...@apache.org>
Authored: Wed Jun 13 17:24:39 2018 +0100
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Jun 13 17:24:39 2018 +0100
----------------------------------------------------------------------
.../qpid/tests/protocol/v0_10/ConnectionTest.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ec957a27/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ConnectionTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ConnectionTest.java b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ConnectionTest.java
index 9022063..18cab0d 100644
--- a/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ConnectionTest.java
+++ b/systests/protocol-tests-amqp-0-10/src/test/java/org/apache/qpid/tests/protocol/v0_10/ConnectionTest.java
@@ -23,9 +23,12 @@ package org.apache.qpid.tests.protocol.v0_10;
import static org.hamcrest.CoreMatchers.both;
import static org.hamcrest.CoreMatchers.is;
import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
+import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.lessThanOrEqualTo;
+import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assume.assumeThat;
import java.net.InetSocketAddress;
@@ -40,6 +43,7 @@ import org.apache.qpid.server.protocol.v0_10.transport.ConnectionSecure;
import org.apache.qpid.server.protocol.v0_10.transport.ConnectionStart;
import org.apache.qpid.server.protocol.v0_10.transport.ConnectionTune;
import org.apache.qpid.tests.protocol.ChannelClosedResponse;
+import org.apache.qpid.tests.protocol.Response;
import org.apache.qpid.tests.protocol.SpecificationTest;
import org.apache.qpid.tests.utils.BrokerAdmin;
import org.apache.qpid.tests.utils.BrokerAdminUsingTestBase;
@@ -262,7 +266,13 @@ public class ConnectionTest extends BrokerAdminUsingTestBase
interaction.consumeResponse().getLatestResponse(ConnectionHeartbeat.class);
- transport.assertNoMoreResponsesAndChannelClosed();
+ // the server might be able to send two heartbeats
+ Response latestResponse = interaction.consumeResponse().getLatestResponse();
+ if (latestResponse !=null && latestResponse.getBody() instanceof ConnectionHeartbeat)
+ {
+ latestResponse = interaction.consumeResponse().getLatestResponse();
+ }
+ assertThat(latestResponse, instanceOf(ChannelClosedResponse.class));
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org