You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by sr...@apache.org on 2015/03/29 13:47:27 UTC
spark git commit: [SPARK-6585][Tests]Fix FileServerSuite testcase in
some Env.
Repository: spark
Updated Branches:
refs/heads/master 52ece26b8 -> 0e2753ff1
[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 <ju...@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
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/0e2753ff
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/0e2753ff
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/0e2753ff
Branch: refs/heads/master
Commit: 0e2753ff14e0d3f2433272c13ce26f67dc89767f
Parents: 52ece26
Author: June.He <ju...@huawei.com>
Authored: Sun Mar 29 12:47:22 2015 +0100
Committer: Sean Owen <so...@cloudera.com>
Committed: Sun Mar 29 12:47:22 2015 +0100
----------------------------------------------------------------------
core/src/test/scala/org/apache/spark/FileServerSuite.scala | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/0e2753ff/core/src/test/scala/org/apache/spark/FileServerSuite.scala
----------------------------------------------------------------------
diff --git a/core/src/test/scala/org/apache/spark/FileServerSuite.scala b/core/src/test/scala/org/apache/spark/FileServerSuite.scala
index 5fdf6bc..a69e9b7 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 {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org