HBASE-14344 Add timeouts to TestHttpServerLifecycle

This commit is contained in:
Matteo Bertozzi 2015-09-03 10:26:27 -07:00
parent e48991970d
commit 5152ac0e20
1 changed files with 11 additions and 7 deletions

View File

@ -46,12 +46,14 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
*
* @throws Throwable on failure
*/
@Test public void testCreatedServerIsNotAlive() throws Throwable {
@Test(timeout=60000)
public void testCreatedServerIsNotAlive() throws Throwable {
HttpServer server = createTestServer();
assertNotLive(server);
}
@Test public void testStopUnstartedServer() throws Throwable {
@Test(timeout=60000)
public void testStopUnstartedServer() throws Throwable {
HttpServer server = createTestServer();
stop(server);
}
@ -61,7 +63,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
*
* @throws Throwable on failure
*/
@Test
@Test(timeout=60000)
public void testStartedServerIsAlive() throws Throwable {
HttpServer server = null;
server = createTestServer();
@ -87,7 +89,8 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
*
* @throws Throwable on failure
*/
@Test public void testStoppedServerIsNotAlive() throws Throwable {
@Test(timeout=60000)
public void testStoppedServerIsNotAlive() throws Throwable {
HttpServer server = createAndStartTestServer();
assertAlive(server);
stop(server);
@ -99,7 +102,8 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
*
* @throws Throwable on failure
*/
@Test public void testStoppingTwiceServerIsAllowed() throws Throwable {
@Test(timeout=60000)
public void testStoppingTwiceServerIsAllowed() throws Throwable {
HttpServer server = createAndStartTestServer();
assertAlive(server);
stop(server);
@ -110,11 +114,11 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
/**
* Test that the server is alive once started
*
*
* @throws Throwable
* on failure
*/
@Test
@Test(timeout=60000)
public void testWepAppContextAfterServerStop() throws Throwable {
HttpServer server = null;
String key = "test.attribute.key";