You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2018/11/12 14:02:31 UTC
qpid-jms git commit: NO-JIRA: ensure handshake completion notified at
server before inspecting state, fixes spurious test failure when using TLSv1.3
Repository: qpid-jms
Updated Branches:
refs/heads/master cf2ef40f6 -> 0cbca5bdb
NO-JIRA: ensure handshake completion notified at server before inspecting state, fixes spurious test failure when using TLSv1.3
Project: http://git-wip-us.apache.org/repos/asf/qpid-jms/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-jms/commit/0cbca5bd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-jms/tree/0cbca5bd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-jms/diff/0cbca5bd
Branch: refs/heads/master
Commit: 0cbca5bdbc3e9bb7257f56d0272b72e959e46de9
Parents: cf2ef40
Author: Robbie Gemmell <ro...@apache.org>
Authored: Mon Nov 12 14:01:26 2018 +0000
Committer: Robbie Gemmell <ro...@apache.org>
Committed: Mon Nov 12 14:01:26 2018 +0000
----------------------------------------------------------------------
.../apache/qpid/jms/transports/netty/NettySslTransportTest.java | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-jms/blob/0cbca5bd/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
----------------------------------------------------------------------
diff --git a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
index 9b4f47a..3a562cc 100644
--- a/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
+++ b/qpid-jms-client/src/test/java/org/apache/qpid/jms/transports/netty/NettySslTransportTest.java
@@ -27,6 +27,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.cert.Certificate;
import java.security.cert.X509Certificate;
+import java.util.concurrent.TimeUnit;
import org.apache.qpid.jms.transports.Transport;
import org.apache.qpid.jms.transports.TransportListener;
@@ -178,6 +179,7 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
assertTrue(transport.isSecure());
// Verify there was a certificate sent to the server
+ assertTrue("Server handshake did not complete in alotted time", server.getSslHandler().handshakeFuture().await(2, TimeUnit.SECONDS));
assertNotNull(server.getSslHandler().engine().getSession().getPeerCertificates());
transport.close();
@@ -217,6 +219,8 @@ public class NettySslTransportTest extends NettyTcpTransportTest {
assertTrue(transport.isConnected());
assertTrue(transport.isSecure());
+ assertTrue("Server handshake did not complete in alotted time", server.getSslHandler().handshakeFuture().await(2, TimeUnit.SECONDS));
+
Certificate[] peerCertificates = server.getSslHandler().engine().getSession().getPeerCertificates();
assertNotNull(peerCertificates);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org