From f5fb24719dd6f75d65d6ec5fe3d539aa43a9dc3a Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 19 Jun 2012 21:19:19 +0200 Subject: [PATCH] Disabling SSL once again --- .../scala/akka/remote/Ticket1978CommunicationSpec.scala | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index 9ecc74ca71..778214a869 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -50,6 +50,9 @@ object Configuration { """ def getCipherConfig(cipher: String, enabled: String*): (String, Boolean, Config) = try { + + if (true) throw new IllegalArgumentException("Ticket1978*Spec isn't enabled") + val config = ConfigFactory.parseString("akka.remote.netty.port=12345").withFallback(ConfigFactory.parseString(conf.format(trustStore, keyStore, cipher, enabled.mkString(", ")))) val fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remote.netty") val settings = new NettySettings(fullConfig, "placeholder") @@ -83,8 +86,8 @@ class Ticket1978AES128CounterRNGFastSpec extends Ticket1978CommunicationSpec(get /** * Both of the Secure variants require access to the Internet to access random.org. */ -//@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) -//class Ticket1978AES128CounterRNGSecureSpec extends Ticket1978CommunicationSpec(getCipherConfig("AES128CounterRNGSecure", "TLS_RSA_WITH_AES_128_CBC_SHA")) +@org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner]) +class Ticket1978AES128CounterRNGSecureSpec extends Ticket1978CommunicationSpec(getCipherConfig("AES128CounterRNGSecure", "TLS_RSA_WITH_AES_128_CBC_SHA")) /** * Both of the Secure variants require access to the Internet to access random.org.