Revert "Sigh, the tests are flakier than a flaky flake from flakeville"
This reverts commit 9862afab84.
This commit is contained in:
parent
9862afab84
commit
53d8ef601e
1 changed files with 0 additions and 3 deletions
|
|
@ -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")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue