diff options
| author | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-14 22:20:14 -0800 |
|---|---|---|
| committer | Tathagata Das <tathagata.das1565@gmail.com> | 2014-01-14 22:20:14 -0800 |
| commit | 1f4718c4805082cb6d6fa5af7c3529c6a79ae4e0 (patch) | |
| tree | b5ece0cae499b1041d179ed34b038004fbd21e77 /external/zeromq/src/test | |
| parent | f8bd828c7ccf1ff69bc35bf95d07183cb35a7c72 (diff) | |
| download | spark-1f4718c4805082cb6d6fa5af7c3529c6a79ae4e0.tar.gz spark-1f4718c4805082cb6d6fa5af7c3529c6a79ae4e0.tar.bz2 spark-1f4718c4805082cb6d6fa5af7c3529c6a79ae4e0.zip | |
Changed SparkConf to not be serializable. And also fixed unit-test log paths in log4j.properties of external modules.
Diffstat (limited to 'external/zeromq/src/test')
| -rw-r--r-- | external/zeromq/src/test/resources/log4j.properties | 2 | ||||
| -rw-r--r-- | external/zeromq/src/test/scala/org/apache/spark/streaming/zeromq/ZeroMQStreamSuite.scala | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/external/zeromq/src/test/resources/log4j.properties b/external/zeromq/src/test/resources/log4j.properties index 063529a9cb..304683dd0b 100644 --- a/external/zeromq/src/test/resources/log4j.properties +++ b/external/zeromq/src/test/resources/log4j.properties @@ -20,7 +20,7 @@ log4j.rootCategory=INFO, file # log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file=org.apache.log4j.FileAppender log4j.appender.file.append=false -log4j.appender.file.file=streaming/target/unit-tests.log +log4j.appender.file.file=external/zeromq/target/unit-tests.log log4j.appender.file.layout=org.apache.log4j.PatternLayout log4j.appender.file.layout.ConversionPattern=%d{yy/MM/dd HH:mm:ss.SSS} %p %c{1}: %m%n diff --git a/external/zeromq/src/test/scala/org/apache/spark/streaming/zeromq/ZeroMQStreamSuite.scala b/external/zeromq/src/test/scala/org/apache/spark/streaming/zeromq/ZeroMQStreamSuite.scala index 4193b8a02f..92d55a7a7b 100644 --- a/external/zeromq/src/test/scala/org/apache/spark/streaming/zeromq/ZeroMQStreamSuite.scala +++ b/external/zeromq/src/test/scala/org/apache/spark/streaming/zeromq/ZeroMQStreamSuite.scala @@ -40,5 +40,6 @@ class ZeroMQStreamSuite extends TestSuiteBase { StorageLevel.MEMORY_AND_DISK_SER_2, SupervisorStrategy.defaultStrategy) // TODO: Actually test data receiving + ssc.stop() } } |