From e730432cb07f060a9e7b11d0ce827faae5fdb8da Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 18 Jun 2012 20:07:58 +0200 Subject: [PATCH] Switching to 256bit for the Ticket1978AES128CounterRNGSecureSpec --- .../akka/remote/Ticket1978CommunicationSpec.scala | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala index e51b3afa01..4ebf37e66c 100644 --- a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala +++ b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala @@ -25,9 +25,9 @@ object Configuration { akka { actor.provider = "akka.remote.RemoteActorRefProvider" test { - single-expect-default = 30s - filter-leeway = 30s - default-timeout = 30s + single-expect-default = 10s + filter-leeway = 10s + default-timeout = 10s } remote.netty { @@ -87,7 +87,7 @@ 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")) +class Ticket1978AES128CounterRNGSecureSpec extends Ticket1978CommunicationSpec(getCipherConfig("AES128CounterRNGSecure", "TLS_RSA_WITH_AES_256_CBC_SHA")) /** * Both of the Secure variants require access to the Internet to access random.org. @@ -103,7 +103,7 @@ class Ticket1978NonExistingRNGSecureSpec extends Ticket1978CommunicationSpec(("N abstract class Ticket1978CommunicationSpec(val cipherEnabledconfig: (String, Boolean, Config)) extends AkkaSpec(cipherEnabledconfig._3) with ImplicitSender { - implicit val timeout: Timeout = Timeout(30 seconds) + implicit val timeout: Timeout = Timeout(5 seconds) import RemoteCommunicationSpec._