diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-12 21:59:51 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-12 21:59:51 -0800 |
| commit | 777c181d2f583570956724f9cbe20eb1dc7048f1 (patch) | |
| tree | 4e042deb8fae3663d8b1692c69c666d7ab9a5f1e /streaming/src/test | |
| parent | 034f89aaab1db95e8908432f2445d6841526efcf (diff) | |
| parent | 405bfe86ef9c3021358d2ac89192857478861fe0 (diff) | |
| download | spark-777c181d2f583570956724f9cbe20eb1dc7048f1.tar.gz spark-777c181d2f583570956724f9cbe20eb1dc7048f1.tar.bz2 spark-777c181d2f583570956724f9cbe20eb1dc7048f1.zip | |
Merge remote-tracking branch 'apache/master' into dstream-move
Conflicts:
streaming/src/main/scala/org/apache/spark/streaming/dstream/DStream.scala
Diffstat (limited to 'streaming/src/test')
| -rw-r--r-- | streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala | 2 | ||||
| -rw-r--r-- | streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala index d293d20644..7037aae234 100644 --- a/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala +++ b/streaming/src/test/scala/org/apache/spark/streaming/BasicOperationsSuite.scala @@ -380,7 +380,7 @@ class BasicOperationsSuite extends TestSuiteBase { val input = Seq(Seq(1), Seq(2), Seq(3), Seq(4)) val stream = new TestInputStream[Int](ssc, input, 2) ssc.registerInputStream(stream) - stream.foreach(_ => {}) // Dummy output stream + stream.foreachRDD(_ => {}) // Dummy output stream ssc.start() Thread.sleep(2000) def getInputFromSlice(fromMillis: Long, toMillis: Long) = { diff --git a/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala b/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala index a4d0f9f978..f7f3346f81 100644 --- a/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala +++ b/streaming/src/test/scala/org/apache/spark/streaming/StreamingContextSuite.scala @@ -187,7 +187,7 @@ class StreamingContextSuite extends FunSuite with BeforeAndAfter with Timeouts { ssc = new StreamingContext(master, appName, batchDuration) val inputStream = addInputStream(ssc) inputStream.map(x => { throw new TestException("error in map task"); x}) - .foreach(_.count) + .foreachRDD(_.count) val exception = intercept[Exception] { ssc.start() |