diff options
| author | June.He <jun.hejun@huawei.com> | 2015-03-29 12:47:22 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-03-29 12:47:22 +0100 |
| commit | 0e2753ff14e0d3f2433272c13ce26f67dc89767f (patch) | |
| tree | bfd54162cabc8f171453111ffb81b69b21be1c42 /core | |
| parent | 52ece26b8fb9769f6ed9167e3dffc8b1d7c61b02 (diff) | |
| download | spark-0e2753ff14e0d3f2433272c13ce26f67dc89767f.tar.gz spark-0e2753ff14e0d3f2433272c13ce26f67dc89767f.tar.bz2 spark-0e2753ff14e0d3f2433272c13ce26f67dc89767f.zip | |
[SPARK-6585][Tests]Fix FileServerSuite testcase in some Env.
Change FileServerSuite.test("HttpFileServer should not work with SSL when the server is untrusted") catch SSLException
Author: June.He <jun.hejun@huawei.com>
Closes #5239 from sisihj/SPARK-6585 and squashes the following commits:
cb19ae3 [June.He] Change FileServerSuite.test("HttpFileServer should not work with SSL when the server is untrusted") catch SSLException
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/test/scala/org/apache/spark/FileServerSuite.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/src/test/scala/org/apache/spark/FileServerSuite.scala b/core/src/test/scala/org/apache/spark/FileServerSuite.scala index 5fdf6bc277..a69e9b761f 100644 --- a/core/src/test/scala/org/apache/spark/FileServerSuite.scala +++ b/core/src/test/scala/org/apache/spark/FileServerSuite.scala @@ -20,7 +20,7 @@ package org.apache.spark import java.io._ import java.net.URI import java.util.jar.{JarEntry, JarOutputStream} -import javax.net.ssl.SSLHandshakeException +import javax.net.ssl.SSLException import com.google.common.io.ByteStreams import org.apache.commons.io.{FileUtils, IOUtils} @@ -228,7 +228,7 @@ class FileServerSuite extends FunSuite with LocalSparkContext { try { server.initialize() - intercept[SSLHandshakeException] { + intercept[SSLException] { fileTransferTest(server) } } finally { |