raboof/pekko
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Packages Wiki Activity Actions 10

Integration with the TestConductor

Browse source 
- Removed old FailureInjector from TestConductor
- Fixed tests to work with the new remoting
- Plugged ThrottlerTransportAdapter into TestConductor
This commit is contained in:
Endre Sándor Varga 2012-12-12 12:20:54 +01:00
parent fbdd830a08
commit a7b78bf78b
14 changed files with 35 additions and 461 deletions
Download patch file Download diff file Expand all files Collapse all files

10
akka-remote-tests/src/main/scala/akka/remote/testkit/MultiNodeSpec.scala
View file

@ -19,7 +19,6 @@ import akka.remote.RemoteActorRefProvider
import akka.testkit._
import scala.concurrent.duration._
import akka.remote.testconductor.RoleName
import akka.remote.testconductor.TestConductorTransport
import akka.actor.RootActorPath
import akka.event.{ Logging, LoggingAdapter }
@ -64,7 +63,7 @@ abstract class MultiNodeConfig {
receive = on
fsm = on
}
akka.remote.log-remote-lifecycle-events = on
akka.remoting.log-remote-lifecycle-events = on
""")
else
ConfigFactory.empty
@ -100,7 +99,7 @@ abstract class MultiNodeConfig {
private[testkit] def config: Config = {
val transportConfig =
if (_testTransport) ConfigFactory.parseString("akka.remote.transport=" + classOf[TestConductorTransport].getName)
if (_testTransport) ConfigFactory.parseString("akka.remoting.transports.tcp.applied-adapters = [gremlin, trttl]")
else ConfigFactory.empty
val configs = (_nodeConf get myself).toList ::: _commonConf.toList ::: transportConfig :: MultiNodeSpec.nodeConfig :: MultiNodeSpec.baseConfig :: Nil
@ -191,8 +190,8 @@ object MultiNodeSpec {
private[testkit] val nodeConfig = mapToConfig(Map(
"akka.actor.provider" -> "akka.remote.RemoteActorRefProvider",
"akka.remote.netty.hostname" -> selfName,
"akka.remote.netty.port" -> selfPort))
"akka.remoting.transports.tcp.hostname" -> selfName,
"akka.remoting.transports.tcp.port" -> selfPort))
private[testkit] val baseConfig: Config = ConfigFactory.parseString("""
akka {
@ -409,7 +408,6 @@ abstract class MultiNodeSpec(val myself: RoleName, _system: ActorSystem, _roles:
// useful to see which jvm is running which role, used by LogRoleReplace utility
log.info("Role [{}] started with address [{}]", myself.name,
//FIXME: Workaround for old-remoting -- must be removed later
system.asInstanceOf[ExtendedActorSystem].provider.asInstanceOf[RemoteActorRefProvider].transport.defaultAddress)
}