From c9eaee20033f29fbbb63c497b80cf4efa4f6a743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A1bor=20Lipt=C3=A1k?= Date: Mon, 12 Oct 2015 20:18:44 -0400 Subject: [PATCH] HBASE-14505 Use Jetty 7 for tests --- hbase-server/pom.xml | 26 +++++++++------------- .../hadoop/hbase/http/TestHttpServerLifecycle.java | 13 +++++------ 2 files changed, 17 insertions(+), 22 deletions(-) diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 6ea1817..d0d3957 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -492,28 +492,24 @@ zookeeper - org.mortbay.jetty - jetty + org.eclipse.jetty + jetty-server + 7.6.9.v20130131 - org.mortbay.jetty + org.eclipse.jetty jetty-util + 7.6.9.v20130131 - org.mortbay.jetty - jetty-sslengine + org.eclipse.jetty + jetty-jsp + 7.6.9.v20130131 - org.mortbay.jetty - jsp-2.1 - - - org.mortbay.jetty - jsp-api-2.1 - - - org.mortbay.jetty - servlet-api-2.5 + org.eclipse.jetty + jetty-servlet + 7.6.9.v20130131 org.codehaus.jackson diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java index 0844c3e..de290e3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java @@ -20,7 +20,6 @@ package org.apache.hadoop.hbase.http; import org.apache.hadoop.hbase.testclassification.MiscTests; import org.apache.hadoop.hbase.testclassification.SmallTests; import org.apache.log4j.Logger; -import org.junit.Ignore; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -47,13 +46,13 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest { * * @throws Throwable on failure */ - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testCreatedServerIsNotAlive() throws Throwable { HttpServer server = createTestServer(); assertNotLive(server); } - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testStopUnstartedServer() throws Throwable { HttpServer server = createTestServer(); stop(server); @@ -64,7 +63,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest { * * @throws Throwable on failure */ - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testStartedServerIsAlive() throws Throwable { HttpServer server = null; server = createTestServer(); @@ -90,7 +89,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest { * * @throws Throwable on failure */ - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testStoppedServerIsNotAlive() throws Throwable { HttpServer server = createAndStartTestServer(); assertAlive(server); @@ -103,7 +102,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest { * * @throws Throwable on failure */ - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testStoppingTwiceServerIsAllowed() throws Throwable { HttpServer server = createAndStartTestServer(); assertAlive(server); @@ -119,7 +118,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest { * @throws Throwable * on failure */ - @Ignore ("Hangs on occasion; see HBASE-14430") @Test(timeout=60000) + @Test(timeout=60000) public void testWepAppContextAfterServerStop() throws Throwable { HttpServer server = null; String key = "test.attribute.key"; -- 2.5.0