You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by mb...@apache.org on 2015/09/03 21:09:44 UTC
[4/5] hbase git commit: HBASE-14344 Add timeouts to
TestHttpServerLifecycle
HBASE-14344 Add timeouts to TestHttpServerLifecycle
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/8a4aee60
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8a4aee60
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8a4aee60
Branch: refs/heads/branch-1
Commit: 8a4aee60820650576e0d0058d3613692c508209f
Parents: 1717de6
Author: Matteo Bertozzi <ma...@cloudera.com>
Authored: Thu Sep 3 10:26:27 2015 -0700
Committer: Matteo Bertozzi <ma...@cloudera.com>
Committed: Thu Sep 3 12:07:43 2015 -0700
----------------------------------------------------------------------
.../hbase/http/TestHttpServerLifecycle.java | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/8a4aee60/hbase-server/src/test/java/org/apache/hadoop/hbase/http/TestHttpServerLifecycle.java
----------------------------------------------------------------------
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 b71db0e..4a2723e 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
@@ -44,12 +44,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);
}
@@ -59,7 +61,7 @@ public class TestHttpServerLifecycle extends HttpServerFunctionalTest {
*
* @throws Throwable on failure
*/
- @Test
+ @Test(timeout=60000)
public void testStartedServerIsAlive() throws Throwable {
HttpServer server = null;
server = createTestServer();
@@ -85,7 +87,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);
@@ -97,7 +100,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);
@@ -108,11 +112,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";