Minor changes for Kafka unit test

Author: jerryshao

external/kafka/src/test/java/org/apache/spark/streaming/kafka/JavaKafkaStreamSuite.java

@@ -36,7 +36,6 @@
 import org.apache.spark.streaming.api.java.JavaStreamingContext;
 
 import org.junit.Test;
-import org.junit.Ignore;
 import org.junit.After;
 import org.junit.Before;
 
@@ -48,7 +47,7 @@ public class JavaKafkaStreamSuite extends LocalJavaStreamingContext implements S
   public void setUp() {
     testSuite.beforeFunction();
     System.clearProperty("spark.driver.port");
-    System.setProperty("spark.streaming.clock", "org.apache.spark.streaming.util.SystemClock");
+    //System.setProperty("spark.streaming.clock", "org.apache.spark.streaming.util.SystemClock");
     ssc = new JavaStreamingContext("local[2]", "test", new Duration(1000));
   }
 
@@ -61,7 +60,7 @@ public void tearDown() {
     testSuite.afterFunction();
   }
 
-  @Ignore @Test
+  @Test
   public void testKafkaStream() {
     String topic = "topic1";
     HashMap<String, Integer> topics = new HashMap<String, Integer>();

external/kafka/src/test/scala/org/apache/spark/streaming/kafka/KafkaStreamSuite.scala

@@ -48,6 +48,8 @@ class KafkaStreamSuite extends TestSuiteBase {
   val brokerConf = new KafkaConfig(brokerProps)
   var server: KafkaServer = _
 
+  override def useManualClock = false
+
   override def beforeFunction() {
     // Zookeeper server startup
     zookeeper = new EmbeddedZookeeper(zkConnect)
@@ -75,7 +77,7 @@ class KafkaStreamSuite extends TestSuiteBase {
     super.afterFunction()
   }
 
-  ignore("kafka input stream") {
+  test("kafka input stream") {
     val ssc = new StreamingContext(master, framework, batchDuration)
     val topic = "topic1"
     val sent = Map("a" -> 5, "b" -> 3, "c" -> 10)