cleanup some test configuration

akka · Oct 5, 2015 · 233ea96 · 233ea96
1 parent 2382aac
commit 233ea96
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 17 deletions.
diff --git a/akka-actor/src/main/resources/reference.conf b/akka-actor/src/main/resources/reference.conf
@@ -82,10 +82,6 @@ akka {
     # Timeout for ActorSystem.actorOf
     creation-timeout = 20s
 
-    # Frequency with which stopping actors are prodded in case they had to be
-    # removed from their parents
-    reaper-interval = 5s
-
     # Serializes and deserializes (non-primitive) messages to ensure immutability,
     # this is only intended for testing.
     serialize-messages = off

diff --git a/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala b/akka-persistence/src/test/scala/akka/persistence/AtLeastOnceDeliverySpec.scala
@@ -407,8 +407,7 @@ abstract class AtLeastOnceDeliverySpec(config: Config) extends PersistenceSpec(c
 }
 
 class LeveldbAtLeastOnceDeliverySpec extends AtLeastOnceDeliverySpec(
-  // TODO disable debug logging once happy with stability of this test
-  ConfigFactory.parseString("""akka.logLevel = DEBUG""") withFallback PersistenceSpec.config("leveldb", "AtLeastOnceDeliverySpec"))
+  PersistenceSpec.config("leveldb", "AtLeastOnceDeliverySpec"))
 
 @org.junit.runner.RunWith(classOf[org.scalatest.junit.JUnitRunner])
 class InmemAtLeastOnceDeliverySpec extends AtLeastOnceDeliverySpec(PersistenceSpec.config("inmem", "AtLeastOnceDeliverySpec"))
diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteNodeShutdownAndComesBackSpec.scala
@@ -30,7 +30,6 @@ object RemoteNodeShutdownAndComesBackSpec extends MultiNodeConfig {
       akka.remote.transport-failure-detector.heartbeat-interval = 1 s
       akka.remote.transport-failure-detector.acceptable-heartbeat-pause = 3 s
       akka.remote.watch-failure-detector.acceptable-heartbeat-pause = 60 s
-      akka.remote.gate-invalid-addresses-for = 0.5 s
                               """)))
 
   testTransport(on = true)

diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/RemoteQuarantinePiercingSpec.scala
@@ -26,8 +26,6 @@ object RemoteQuarantinePiercingSpec extends MultiNodeConfig {
     ConfigFactory.parseString("""
       akka.loglevel = INFO
       akka.remote.log-remote-lifecycle-events = INFO
-      akka.remote.quarantine-systems-for = 1 d
-      akka.remote.gate-invalid-addresses-for = 0.5 s
                               """)))
 
   class Subject extends Actor {

diff --git a/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala b/akka-remote-tests/src/multi-jvm/scala/akka/remote/Ticket15109Spec.scala
@@ -31,7 +31,6 @@ object Ticket15109Spec extends MultiNodeConfig {
       ## Keep it tight, otherwise reestablishing a connection takes too much time
       akka.remote.transport-failure-detector.heartbeat-interval = 1 s
       akka.remote.transport-failure-detector.acceptable-heartbeat-pause = 3 s
-      akka.remote.quarantine-systems-for = 1 d
       akka.remote.retry-gate-closed-for = 0.5 s
                               """)))
 

diff --git a/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala b/akka-remote/src/test/scala/akka/remote/RemotingSpec.scala
@@ -82,8 +82,6 @@ object RemotingSpec {
       actor.provider = "akka.remote.RemoteActorRefProvider"
 
       remote {
-        transport = "akka.remote.Remoting"
-
         retry-gate-closed-for = 1 s
         log-remote-lifecycle-events = on
 
@@ -637,7 +635,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       val config = ConfigFactory.parseString(s"""
         akka.remote.enabled-transports = ["akka.remote.test"]
         akka.remote.retry-gate-closed-for = 5s
-        akka.remote.log-lifecylce-events = on
+        akka.remote.log-remote-lifecycle-events = on
         #akka.loglevel = DEBUG
 
         akka.remote.test {
@@ -717,7 +715,7 @@ class RemotingSpec extends AkkaSpec(RemotingSpec.cfg) with ImplicitSender with D
       val config = ConfigFactory.parseString(s"""
         akka.remote.enabled-transports = ["akka.remote.test"]
         akka.remote.retry-gate-closed-for = 5s
-        akka.remote.log-lifecylce-events = on
+        akka.remote.log-remote-lifecycle-events = on
 
         akka.remote.test {
           registry-key = JMeMndLLsw

diff --git a/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala b/akka-remote/src/test/scala/akka/remote/Ticket1978CommunicationSpec.scala
@@ -42,7 +42,6 @@ object Configuration {
         hostname = localhost
         port = %d
         security {
-          enable = on
           trust-store = "%s"
           key-store = "%s"
           key-store-password = "changeme"

diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolSpec.scala
@@ -38,7 +38,6 @@ class AkkaProtocolSpec extends AkkaSpec("""akka.actor.provider = "akka.remote.Re
 
         transport-failure-detector {
           implementation-class = "akka.remote.PhiAccrualFailureDetector"
-          threshold = 7.0
           max-sample-size = 100
           min-std-deviation = 100 ms
           acceptable-heartbeat-pause = 3 s

diff --git a/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala b/akka-remote/src/test/scala/akka/remote/transport/AkkaProtocolStressTest.scala
@@ -20,7 +20,6 @@ object AkkaProtocolStressTest {
       remote.log-remote-lifecycle-events = on
 
       remote.transport-failure-detector {
-        threshold = 1.0
         max-sample-size = 2
         min-std-deviation = 1 ms
         ## We want lots of lost connections in this test, keep it sensitive