fix up multi-jvm tests

akka-cluster/src/multi-jvm/scala/akka/cluster/ClusterAccrualFailureDetectorSpec.scala

@@ -34,7 +34,7 @@ abstract class ClusterAccrualFailureDetectorSpec
     "receive heartbeats so that all member nodes in the cluster are marked 'available'" taggedAs LongRunningTest in {
       awaitClusterUp(first, second, third)
 
-      5.seconds.dilated.sleep // let them heartbeat
+      Thread.sleep(5.seconds.dilated.toMillis) // let them heartbeat
       cluster.failureDetector.isAvailable(first) must be(true)
       cluster.failureDetector.isAvailable(second) must be(true)
       cluster.failureDetector.isAvailable(third) must be(true)

akka-cluster/src/multi-jvm/scala/akka/cluster/ConvergenceSpec.scala

@@ -106,7 +106,7 @@ abstract class ConvergenceSpec
           log.debug("assertNotMovedUp#" + n)
           assertNotMovedUp
           // wait and then check again
-          1.second.dilated.sleep
+          Thread.sleep(1.second.dilated.toMillis)
         }
       }
 

akka-cluster/src/multi-jvm/scala/akka/cluster/JoinInProgressSpec.scala

@@ -9,7 +9,7 @@ import akka.remote.testkit.MultiNodeConfig
 import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
 import scala.concurrent.util.duration._
-import akka.util.Deadline
+import scala.concurrent.util.Deadline
 
 object JoinInProgressMultiJvmSpec extends MultiNodeConfig {
   val first = role("first")
@@ -54,7 +54,7 @@ abstract class JoinInProgressSpec
       runOn(first) {
         val until = Deadline.now + 5.seconds
         while (!until.isOverdue) {
-          200.millis.sleep
+          Thread.sleep(200)
           cluster.failureDetector.isAvailable(second) must be(true)
         }
       }

akka-cluster/src/multi-jvm/scala/akka/cluster/LargeClusterSpec.scala

@@ -9,10 +9,10 @@ import akka.remote.testkit.MultiNodeSpec
 import akka.testkit._
 import scala.concurrent.util.duration._
 import akka.actor.ActorSystem
-import akka.util.Deadline
+import scala.concurrent.util.Deadline
 import java.util.concurrent.TimeoutException
 import scala.collection.immutable.SortedSet
-import akka.dispatch.Await
+import scala.concurrent.Await
 import scala.concurrent.util.Duration
 import java.util.concurrent.TimeUnit
 import akka.remote.testconductor.RoleName

akka-cluster/src/multi-jvm/scala/akka/cluster/NodeUpSpec.scala

@@ -54,7 +54,7 @@ abstract class NodeUpSpec
 
       // let it run for a while to make sure that nothing bad happens
       for (n ← 1 to 20) {
-        100.millis.dilated.sleep()
+        Thread.sleep(100.millis.dilated.toMillis)
         unexpected.get must be(SortedSet.empty)
         cluster.latestGossip.members.forall(_.status == MemberStatus.Up) must be(true)
       }

akka-cluster/src/multi-jvm/scala/akka/cluster/SunnyWeatherSpec.scala

@@ -68,7 +68,7 @@ abstract class SunnyWeatherSpec
         awaitUpConvergence(roles.size)
         assertLeaderIn(roles)
         if (n % 5 == 0) log.info("Passed period [{}]", n)
-        1.seconds.sleep
+        Thread.sleep(1000)
       }
 
       enterBarrier("after")

akka-cluster/src/multi-jvm/scala/akka/cluster/UnreachableNodeRejoinsClusterSpec.scala

@@ -61,7 +61,7 @@ abstract class UnreachableNodeRejoinsClusterSpec
       // let them send at least one heartbeat to each other after the gossip convergence
       // because for new joining nodes we remove them from the failure detector when
       // receive gossip
-      2.seconds.dilated.sleep
+      Thread.sleep(2.seconds.dilated.toMillis)
 
       runOn(first) {
         // pull network for victim node from all nodes

akka-remote-tests/src/main/scala/akka/remote/testconductor/Conductor.scala

@@ -4,7 +4,6 @@
 package akka.remote.testconductor
 
 import language.postfixOps
-
 import akka.actor.{ Actor, ActorRef, ActorSystem, LoggingFSM, Props }
 import RemoteConnection.getAddrString
 import TestConductorProtocol._
@@ -23,6 +22,7 @@ import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit.MILLISECONDS
 import akka.util.{ Timeout }
 import scala.concurrent.util.{ Deadline, Duration }
+import scala.reflect.classTag
 
 sealed trait Direction {
   def includes(other: Direction): Boolean
@@ -97,7 +97,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def sockAddr: Future[InetSocketAddress] = {
     import Settings.QueryTimeout
-    controller ? GetSockAddr mapTo
+    controller ? GetSockAddr mapTo classTag[InetSocketAddress]
   }
 
   /**
@@ -120,7 +120,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def throttle(node: RoleName, target: RoleName, direction: Direction, rateMBit: Double): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Throttle(node, target, direction, rateMBit.toFloat) mapTo
+    controller ? Throttle(node, target, direction, rateMBit.toFloat) mapTo classTag[Done]
   }
 
   /**
@@ -135,7 +135,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def blackhole(node: RoleName, target: RoleName, direction: Direction): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Throttle(node, target, direction, 0f) mapTo
+    controller ? Throttle(node, target, direction, 0f) mapTo classTag[Done]
   }
 
   /**
@@ -148,7 +148,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def passThrough(node: RoleName, target: RoleName, direction: Direction): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Throttle(node, target, direction, -1f) mapTo
+    controller ? Throttle(node, target, direction, -1f) mapTo classTag[Done]
   }
 
   /**
@@ -161,7 +161,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def disconnect(node: RoleName, target: RoleName): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Disconnect(node, target, false) mapTo
+    controller ? Disconnect(node, target, false) mapTo classTag[Done]
   }
 
   /**
@@ -174,7 +174,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def abort(node: RoleName, target: RoleName): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Disconnect(node, target, true) mapTo
+    controller ? Disconnect(node, target, true) mapTo classTag[Done]
   }
 
   /**
@@ -187,7 +187,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def shutdown(node: RoleName, exitValue: Int): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Terminate(node, exitValue) mapTo
+    controller ? Terminate(node, exitValue) mapTo classTag[Done]
   }
 
   /**
@@ -198,7 +198,7 @@ trait Conductor { this: TestConductorExt ⇒
   // TODO: uncomment (and implement in Controller) if really needed
   //  def kill(node: RoleName): Future[Done] = {
   //    import Settings.QueryTimeout
-  //    controller ? Terminate(node, -1) mapTo
+  //    controller ? Terminate(node, -1) mapTo classTag[Done]
   //  }
 
   /**
@@ -206,7 +206,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def getNodes: Future[Iterable[RoleName]] = {
     import Settings.QueryTimeout
-    controller ? GetNodes mapTo
+    controller ? GetNodes mapTo classTag[Iterable[RoleName]]
   }
 
   /**
@@ -219,7 +219,7 @@ trait Conductor { this: TestConductorExt ⇒
    */
   def removeNode(node: RoleName): Future[Done] = {
     import Settings.QueryTimeout
-    controller ? Remove(node) mapTo
+    controller ? Remove(node) mapTo classTag[Done]
   }
 
 }
@@ -239,7 +239,7 @@ private[akka] class ConductorHandler(_createTimeout: Timeout, controller: ActorR
   override def channelConnected(ctx: ChannelHandlerContext, event: ChannelStateEvent) = {
     val channel = event.getChannel
     log.debug("connection from {}", getAddrString(channel))
-    val fsm: ActorRef = Await.result(controller ? Controller.CreateServerFSM(channel) mapTo, Duration.Inf)
+    val fsm: ActorRef = Await.result(controller ? Controller.CreateServerFSM(channel) mapTo classTag[ActorRef], Duration.Inf)
     clients.put(channel, fsm)
   }
 

akka-remote-tests/src/main/scala/akka/remote/testconductor/Player.scala

@@ -20,6 +20,7 @@ import scala.concurrent.Future
 import scala.util.control.NoStackTrace
 import akka.event.{ LoggingAdapter, Logging }
 import java.net.{ InetSocketAddress, ConnectException }
+import scala.reflect.classTag
 
 /**
  * The Player is the client component of the
@@ -62,7 +63,7 @@ trait Player { this: TestConductorExt ⇒
       }
     }))
 
-    a ? client mapTo
+    a ? client mapTo classTag[Done]
   }
 
   /**
@@ -104,7 +105,7 @@ trait Player { this: TestConductorExt ⇒
    */
   def getAddressFor(name: RoleName): Future[Address] = {
     import Settings.QueryTimeout
-    client ? ToServer(GetAddress(name)) mapTo
+    client ? ToServer(GetAddress(name)) mapTo classTag[Address]
   }
 }