From 53d8ef601eaa28b180c3ebcbf7fa6da3296d78f6 Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Tue, 19 Jun 2012 15:24:00 +0200 Subject: [PATCH] Revert "Sigh, the tests are flakier than a flaky flake from flakeville" This reverts commit 9862afab84eb76c55c72b6bb939118f90278a80c. --- .../test/scala/akka/remote/Ticket1978CommunicationSpec.scala | 3 --- 1 file changed, 3 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index 2ff63b20a4..9536b983a7 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -50,9 +50,6 @@ object Configuration { """ def getCipherConfig(cipher: String, enabled: String*): (String, Boolean, Config) = try { - - if (true) throw new IllegalArgumentException("Test not 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")