From 218aa507b575299f7c86d23f5afd02c141c5e032 Mon Sep 17 00:00:00 2001 From: Bryan Cutler Date: Tue, 23 Jun 2015 22:37:27 -0700 Subject: [PATCH] [SPARK-6980] Corrected issues from feedback --- core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala | 4 ++-- .../scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala b/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala index a7d1839788eb1..70834636b3235 100644 --- a/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala +++ b/core/src/test/scala/org/apache/spark/rpc/RpcEnvSuite.scala @@ -551,7 +551,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll { val testDurationSeconds = 30 val secondaryProp = "spark.ask.secondary.timeout" - conf.set(testProp, testDurationSeconds.toString + "s") + conf.set(testProp, s"${testDurationSeconds}s") conf.set(secondaryProp, "100s") // Construct RpcTimeout with a single property @@ -570,7 +570,7 @@ abstract class RpcEnvSuite extends SparkFunSuite with BeforeAndAfterAll { assert( rt3.timeoutProp.contains(defaultProp) ) // Try to construct RpcTimeout with an unconfigured property - intercept[Throwable] { + intercept[NoSuchElementException] { RpcTimeout(conf, "spark.ask.invalid.timeout") } } diff --git a/core/src/test/scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala b/core/src/test/scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala index c0240c974ff7d..b40c7eefdcdb7 100644 --- a/core/src/test/scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala +++ b/core/src/test/scala/org/apache/spark/rpc/akka/AkkaRpcEnvSuite.scala @@ -24,7 +24,6 @@ import scala.language.postfixOps import akka.actor.{Actor, ActorSystem, Props} import akka.pattern.ask - import com.typesafe.config.{ConfigFactory, ConfigValueFactory} import org.apache.spark.{SecurityManager, SparkConf}