changed test back and commented out import to break compile

Brennon York · Brennon York · commit 56d3cb93f30c · 2015-04-29T13:16:52.000-07:00
diff --git a/core/src/main/scala/org/apache/spark/SparkContext.scala b/core/src/main/scala/org/apache/spark/SparkContext.scala
@@ -39,7 +39,7 @@ import org.apache.hadoop.io.{ArrayWritable, BooleanWritable, BytesWritable, Doub
   FloatWritable, IntWritable, LongWritable, NullWritable, Text, Writable}
 import org.apache.hadoop.mapred.{FileInputFormat, InputFormat, JobConf, SequenceFileInputFormat,
   TextInputFormat}
-import org.apache.hadoop.mapreduce.{InputFormat => NewInputFormat, Job => NewHadoopJob}
+//import org.apache.hadoop.mapreduce.{InputFormat => NewInputFormat, Job => NewHadoopJob}
 import org.apache.hadoop.mapreduce.lib.input.{FileInputFormat => NewFileInputFormat}
 
 import org.apache.mesos.MesosNativeLibrary
diff --git a/core/src/test/scala/org/apache/spark/ShuffleSuite.scala b/core/src/test/scala/org/apache/spark/ShuffleSuite.scala
@@ -84,8 +84,7 @@ abstract class ShuffleSuite extends FunSuite with Matchers with LocalSparkContex
       NonJavaSerializableClass,
       NonJavaSerializableClass](b, new HashPartitioner(3))
     c.setSerializer(new KryoSerializer(conf))
-    // assert(c.count === 10)
-    assert(c.count === 42)
+    assert(c.count === 10)
   }
 
   test("zero sized blocks") {

Original file line number	Diff line number	Diff line change
`@@ -84,8 +84,7 @@ abstract class ShuffleSuite extends FunSuite with Matchers with LocalSparkContex`
`84`	`84`	`NonJavaSerializableClass,`
`85`	`85`	`NonJavaSerializableClass](b, new HashPartitioner(3))`
`86`	`86`	`c.setSerializer(new KryoSerializer(conf))`
`87`		`- // assert(c.count === 10)`
`88`		`- assert(c.count === 42)`
	`87`	`+ assert(c.count === 10)`
`89`	`88`	`}`
`90`	`89`
`91`	`90`	`test("zero sized blocks") {`