From 9fd81079227f933de492a3a20b894561470dab98 Mon Sep 17 00:00:00 2001 From: Viktor Kolomeyko Date: Wed, 5 Aug 2020 10:02:23 +0100 Subject: [PATCH] INFRA-570: Disable new SSL tests when running on JDK11 (#6560) --- .../net/corda/node/amqp/AMQPClientSslErrorsTest.kt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt b/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt index 27a8a28189..b1bf4b99f8 100644 --- a/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt +++ b/node/src/integration-test/kotlin/net/corda/node/amqp/AMQPClientSslErrorsTest.kt @@ -3,6 +3,7 @@ package net.corda.node.amqp import com.nhaarman.mockito_kotlin.doReturn import com.nhaarman.mockito_kotlin.mock import com.nhaarman.mockito_kotlin.whenever +import net.corda.core.internal.JavaVersion import net.corda.core.internal.div import net.corda.core.toFuture import net.corda.core.utilities.NetworkHostAndPort @@ -19,6 +20,7 @@ import net.corda.nodeapi.internal.protonwrapper.netty.toRevocationConfig import net.corda.testing.core.ALICE_NAME import net.corda.testing.core.BOB_NAME import net.corda.testing.driver.internal.incrementalPortAllocation +import org.junit.Assume.assumeFalse import org.junit.Before import org.junit.Rule import org.junit.Test @@ -133,6 +135,9 @@ class AMQPClientSslErrorsTest(@Suppress("unused") private val iteration: Int) { @Test(timeout = 300_000) fun trivialClientServerExchange() { + // SSL works quite differently in JDK 11 and re-work is needed + assumeFalse(JavaVersion.isVersionAtLeast(JavaVersion.Java_11)) + val serverPort = portAllocation.nextPort() val serverThread = ServerThread(serverKeyManagerFactory, serverTrustManagerFactory, serverPort).also { it.start() } @@ -168,6 +173,9 @@ class AMQPClientSslErrorsTest(@Suppress("unused") private val iteration: Int) { @Test(timeout = 300_000) fun amqpClientServerConnect() { + // SSL works quite differently in JDK 11 and re-work is needed + assumeFalse(JavaVersion.isVersionAtLeast(JavaVersion.Java_11)) + val serverPort = portAllocation.nextPort() val serverThread = ServerThread(serverKeyManagerFactory, serverTrustManagerFactory, serverPort) .also { it.start() } @@ -188,6 +196,9 @@ class AMQPClientSslErrorsTest(@Suppress("unused") private val iteration: Int) { @Test(timeout = 300_000) fun amqpClientServerHandshakeTimeout() { + // SSL works quite differently in JDK 11 and re-work is needed + assumeFalse(JavaVersion.isVersionAtLeast(JavaVersion.Java_11)) + val serverPort = portAllocation.nextPort() val serverThread = ServerThread(serverKeyManagerFactory, serverTrustManagerFactory, serverPort, 5.seconds) .also { it.start() }