From 843eafb343bac705e8a4a091501ca2d55df78240 Mon Sep 17 00:00:00 2001 From: Jacek Lewandowski Date: Tue, 17 Feb 2015 20:00:38 +0100 Subject: [PATCH 1/2] SPARK-5548: Fix for AkkaUtilsSuite failure - attempt 2 --- .../scala/org/apache/spark/util/AkkaUtilsSuite.scala | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala index 2cc5817758cf7..83cb8696123b5 100644 --- a/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala @@ -20,6 +20,7 @@ package org.apache.spark.util import java.util.concurrent.TimeoutException import scala.concurrent.Await +import scala.util.{Failure, Try} import akka.actor._ @@ -370,9 +371,13 @@ class AkkaUtilsSuite extends FunSuite with LocalSparkContext with ResetSystemPro val selection = slaveSystem.actorSelection( AkkaUtils.address(AkkaUtils.protocol(slaveSystem), "spark", "localhost", boundPort, "MapOutputTracker")) val timeout = AkkaUtils.lookupTimeout(conf) - intercept[TimeoutException] { - slaveTracker.trackerActor = Await.result(selection.resolveOne(timeout * 2), timeout) + val result = Try(Await.result(selection.resolveOne(timeout * 2), timeout)) + + assert(result.isFailure === true) + val exception = result match { + case Failure(ex) => ex } + assert(exception.isInstanceOf[ActorNotFound] || exception.isInstanceOf[TimeoutException]) actorSystem.shutdown() slaveSystem.shutdown() From 0e199b695d59fd43f2274753b3a6cdad6f10d394 Mon Sep 17 00:00:00 2001 From: Jacek Lewandowski Date: Thu, 19 Feb 2015 06:14:32 +0100 Subject: [PATCH 2/2] SPARK-5548: applied reviewer's comments --- .../test/scala/org/apache/spark/util/AkkaUtilsSuite.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala index 83cb8696123b5..6250d50fb7036 100644 --- a/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala +++ b/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala @@ -373,11 +373,11 @@ class AkkaUtilsSuite extends FunSuite with LocalSparkContext with ResetSystemPro val timeout = AkkaUtils.lookupTimeout(conf) val result = Try(Await.result(selection.resolveOne(timeout * 2), timeout)) - assert(result.isFailure === true) - val exception = result match { - case Failure(ex) => ex + result match { + case Failure(ex: ActorNotFound) => + case Failure(ex: TimeoutException) => + case r => fail(s"$r is neither Failure(ActorNotFound) nor Failure(TimeoutException)") } - assert(exception.isInstanceOf[ActorNotFound] || exception.isInstanceOf[TimeoutException]) actorSystem.shutdown() slaveSystem.shutdown()