[SPARK-6980] Corrected issues from feedback

markhamstra · Jun 24, 2015 · 218aa50 · 218aa50
1 parent fadaf6f
commit 218aa50
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 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
@@ -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
@@ -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}