You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by an...@apache.org on 2015/02/19 18:53:44 UTC
spark git commit: SPARK-5548: Fix for AkkaUtilsSuite failure -
attempt 2
Repository: spark
Updated Branches:
refs/heads/master e945aa613 -> fb87f4492
SPARK-5548: Fix for AkkaUtilsSuite failure - attempt 2
Author: Jacek Lewandowski <le...@gmail.com>
Closes #4653 from jacek-lewandowski/SPARK-5548-2-master and squashes the following commits:
0e199b6 [Jacek Lewandowski] SPARK-5548: applied reviewer's comments
843eafb [Jacek Lewandowski] SPARK-5548: Fix for AkkaUtilsSuite failure - attempt 2
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/fb87f449
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/fb87f449
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/fb87f449
Branch: refs/heads/master
Commit: fb87f449219c673a16bc46f85c1ef7a6e3f22736
Parents: e945aa6
Author: Jacek Lewandowski <le...@gmail.com>
Authored: Thu Feb 19 09:53:36 2015 -0800
Committer: Andrew Or <an...@databricks.com>
Committed: Thu Feb 19 09:53:36 2015 -0800
----------------------------------------------------------------------
.../test/scala/org/apache/spark/util/AkkaUtilsSuite.scala | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/fb87f449/core/src/test/scala/org/apache/spark/util/AkkaUtilsSuite.scala
----------------------------------------------------------------------
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 2cc5817..6250d50 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,8 +371,12 @@ 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))
+
+ result match {
+ case Failure(ex: ActorNotFound) =>
+ case Failure(ex: TimeoutException) =>
+ case r => fail(s"$r is neither Failure(ActorNotFound) nor Failure(TimeoutException)")
}
actorSystem.shutdown()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org