Revert "Sigh, the tests are flakier than a flaky flake from flakeville"

This reverts commit 9862afab84.
This commit is contained in:
Viktor Klang 2012-06-19 15:24:00 +02:00
parent 9862afab84
commit 53d8ef601e

View file

@ -50,9 +50,6 @@ object Configuration {
""" """
def getCipherConfig(cipher: String, enabled: String*): (String, Boolean, Config) = try { 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 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 fullConfig = config.withFallback(AkkaSpec.testConf).withFallback(ConfigFactory.load).getConfig("akka.remote.netty")
val settings = new NettySettings(fullConfig, "placeholder") val settings = new NettySettings(fullConfig, "placeholder")