aboutsummaryrefslogtreecommitdiff
path: root/external/flume-sink/src
diff options
context:
space:
mode:
authorTathagata Das <tathagata.das1565@gmail.com>2014-08-22 21:34:48 -0700
committerPatrick Wendell <pwendell@gmail.com>2014-08-22 21:34:48 -0700
commit3004074152b7261c2a968bb8e94ec7c41a7b43c1 (patch)
tree576634f49600123f38d2c8d398d7f07408563c35 /external/flume-sink/src
parenta5219db1ece20a1c45f927d4d0e085474f0bf34e (diff)
downloadspark-3004074152b7261c2a968bb8e94ec7c41a7b43c1.tar.gz
spark-3004074152b7261c2a968bb8e94ec7c41a7b43c1.tar.bz2
spark-3004074152b7261c2a968bb8e94ec7c41a7b43c1.zip
[SPARK-3169] Removed dependency on spark streaming test from spark flume sink
Due to maven bug https://jira.codehaus.org/browse/MNG-1378, maven could not resolve spark streaming classes required by the spark-streaming test-jar dependency of external/flume-sink. There is no particular reason that the external/flume-sink has to depend on Spark Streaming at all, so I am eliminating this dependency. Also I have removed the exclusions present in the Flume dependencies, as there is no reason to exclude them (they were excluded in the external/flume module to prevent dependency collisions with Spark). Since Jenkins will test the sbt build and the unit test, I only tested maven compilation locally. Author: Tathagata Das <tathagata.das1565@gmail.com> Closes #2101 from tdas/spark-sink-pom-fix and squashes the following commits: 8f42621 [Tathagata Das] Added Flume sink exclusions back, and added netty to test dependencies 93b559f [Tathagata Das] Removed dependency on spark streaming test from spark flume sink
Diffstat (limited to 'external/flume-sink/src')
-rw-r--r--external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala10
1 files changed, 5 insertions, 5 deletions
diff --git a/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala b/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala
index 44b27edf85..75a6668c62 100644
--- a/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala
+++ b/external/flume-sink/src/test/scala/org/apache/spark/streaming/flume/sink/SparkSinkSuite.scala
@@ -30,14 +30,14 @@ import org.apache.avro.ipc.specific.SpecificRequestor
import org.apache.flume.Context
import org.apache.flume.channel.MemoryChannel
import org.apache.flume.event.EventBuilder
-import org.apache.spark.streaming.TestSuiteBase
import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory
+import org.scalatest.FunSuite
-class SparkSinkSuite extends TestSuiteBase {
+class SparkSinkSuite extends FunSuite {
val eventsPerBatch = 1000
val channelCapacity = 5000
- test("Success") {
+ test("Success with ack") {
val (channel, sink) = initializeChannelAndSink()
channel.start()
sink.start()
@@ -57,7 +57,7 @@ class SparkSinkSuite extends TestSuiteBase {
transceiver.close()
}
- test("Nack") {
+ test("Failure with nack") {
val (channel, sink) = initializeChannelAndSink()
channel.start()
sink.start()
@@ -76,7 +76,7 @@ class SparkSinkSuite extends TestSuiteBase {
transceiver.close()
}
- test("Timeout") {
+ test("Failure with timeout") {
val (channel, sink) = initializeChannelAndSink(Map(SparkSinkConfig
.CONF_TRANSACTION_TIMEOUT -> 1.toString))
channel.start()