hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mberto...@apache.org
Subject [1/5] hbase git commit: HBASE-14344 Add timeouts to TestHttpServerLifecycle
Date Thu, 03 Sep 2015 19:09:41 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1 1717de65a -> 8a4aee608
  refs/heads/branch-1.0 e19cb719d -> 9b3e4bc89
  refs/heads/branch-1.1 670d9e77c -> f0f6e075f
  refs/heads/branch-1.2 3488ec4be -> df17a6949
  refs/heads/master e48991970 -> 5152ac0e2


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/df17a694
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/df17a694
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/df17a694

Branch: refs/heads/branch-1.2
Commit: df17a6949e45de78bd6dd297f9457be12a4d7edd
Parents: 3488ec4
Author: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Authored: Thu Sep 3 10:26:27 2015 -0700
Committer: Matteo Bertozzi <matteo.bertozzi@cloudera.com>
Committed: Thu Sep 3 10:43:54 2015 -0700

----------------------------------------------------------------------
 .../hbase/http/TestHttpServerLifecycle.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/df17a694/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";


Mime
View raw message