diff options
| author | Reynold Xin <rxin@apache.org> | 2013-10-07 10:47:45 -0700 |
|---|---|---|
| committer | Reynold Xin <rxin@apache.org> | 2013-10-07 10:54:22 -0700 |
| commit | 213b70a2db5e92ada4b762bc39876c01a3530897 (patch) | |
| tree | f60d35cca0cae528b2b0cae24b77eb18c0b921b8 /core | |
| parent | d585613ee22ed9292a69e35cedb0d5965f4c906f (diff) | |
| download | spark-213b70a2db5e92ada4b762bc39876c01a3530897.tar.gz spark-213b70a2db5e92ada4b762bc39876c01a3530897.tar.bz2 spark-213b70a2db5e92ada4b762bc39876c01a3530897.zip | |
Merge pull request #31 from sundeepn/branch-0.8
Resolving package conflicts with hadoop 0.23.9
Hadoop 0.23.9 is having a package conflict with easymock's dependencies.
(cherry picked from commit 023e3fdf008b3194a36985a07923df9aaf64e520)
Signed-off-by: Reynold Xin <rxin@apache.org>
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/test/scala/org/apache/spark/ui/UISuite.scala | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/src/test/scala/org/apache/spark/ui/UISuite.scala b/core/src/test/scala/org/apache/spark/ui/UISuite.scala index 07c9f2382b..8f0ec6683b 100644 --- a/core/src/test/scala/org/apache/spark/ui/UISuite.scala +++ b/core/src/test/scala/org/apache/spark/ui/UISuite.scala @@ -26,7 +26,12 @@ class UISuite extends FunSuite { test("jetty port increases under contention") { val startPort = 4040 val server = new Server(startPort) - server.start() + + Try { server.start() } match { + case Success(s) => + case Failure(e) => + // Either case server port is busy hence setup for test complete + } val (jettyServer1, boundPort1) = JettyUtils.startJettyServer("localhost", startPort, Seq()) val (jettyServer2, boundPort2) = JettyUtils.startJettyServer("localhost", startPort, Seq()) |