Fix tests after logical merge conflict

Andrew Or · Andrew Or · commit 7790b6cd57a7 · 2015-05-28T12:37:12.000-07:00
diff --git a/core/src/test/scala/org/apache/spark/serializer/KryoSerializerSuite.scala b/core/src/test/scala/org/apache/spark/serializer/KryoSerializerSuite.scala
@@ -360,7 +360,7 @@ class KryoSerializerSuite extends SparkFunSuite with SharedSparkContext {
   }
 }
 
-class KryoSerializerAutoResetDisabledSuite extends FunSuite with SharedSparkContext {
+class KryoSerializerAutoResetDisabledSuite extends SparkFunSuite with SharedSparkContext {
   conf.set("spark.serializer", classOf[KryoSerializer].getName)
   conf.set("spark.kryo.registrator", classOf[RegistratorWithoutAutoReset].getName)
   conf.set("spark.kryo.referenceTracking", "true")

Original file line number	Diff line number	Diff line change
`@@ -360,7 +360,7 @@ class KryoSerializerSuite extends SparkFunSuite with SharedSparkContext {`
`360`	`360`	`}`
`361`	`361`	`}`
`362`	`362`
`363`		`-class KryoSerializerAutoResetDisabledSuite extends FunSuite with SharedSparkContext {`
	`363`	`+class KryoSerializerAutoResetDisabledSuite extends SparkFunSuite with SharedSparkContext {`
`364`	`364`	`conf.set("spark.serializer", classOf[KryoSerializer].getName)`
`365`	`365`	`conf.set("spark.kryo.registrator", classOf[RegistratorWithoutAutoReset].getName)`
`366`	`366`	`conf.set("spark.kryo.referenceTracking", "true")`