[knox] branch master updated: KNOX-1775 - Cleanup test timeout handling

[krisden]

This is an automated email from the ASF dual-hosted git repository.

krisden pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git


The following commit(s) were added to refs/heads/master by this push:
     new f067b8f  KNOX-1775 - Cleanup test timeout handling
f067b8f is described below

commit f067b8ffbee5186f838ad73ab3a8e6e37b44256e
Author: Kevin Risden <kris...@apache.org>
AuthorDate: Mon Feb 11 14:18:22 2019 -0500

    KNOX-1775 - Cleanup test timeout handling
    
    Signed-off-by: Kevin Risden <kris...@apache.org>
---
 .../src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java | 8 ++++----
 .../test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java   | 4 ++--
 .../org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java | 6 ++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git 
a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java 
b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java
index 0a378d2..9cbe366 100644
--- a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayAppFuncTest.java
@@ -265,7 +265,7 @@ public class GatewayAppFuncTest {
     LOG_EXIT();
   }
 
-  @Test//( timeout = TestUtils.MEDIUM_TIMEOUT )
+  @Test
   public void testDefaultAppName() throws Exception {
     LOG_ENTER();
 
@@ -303,7 +303,7 @@ public class GatewayAppFuncTest {
     LOG_EXIT();
   }
 
-  @Test//( timeout = TestUtils.MEDIUM_TIMEOUT )
+  @Test
   public void testMultiApps() throws Exception {
     LOG_ENTER();
 
@@ -382,7 +382,7 @@ public class GatewayAppFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
+  @Test( timeout = TestUtils.LONG_TIMEOUT )
   public void testServicesAndApplications() throws Exception {
     LOG_ENTER();
 
@@ -461,7 +461,7 @@ public class GatewayAppFuncTest {
     LOG_EXIT();
   }
 
-  @Test//( timeout = TestUtils.MEDIUM_TIMEOUT )
+  @Test
   public void testDeploymentCleanup() throws Exception {
     LOG_ENTER();
 
diff --git 
a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java 
b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
index c148025..47c151e 100644
--- 
a/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/knox/gateway/GatewayBasicFuncTest.java
@@ -2297,7 +2297,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test//( timeout = MEDIUM_TIMEOUT )
+  @Test
   public void testYarnRmApplication() throws Exception {
     LOG_ENTER();
     getYarnRmApp( ContentType.JSON, true );
@@ -3327,7 +3327,7 @@ public class GatewayBasicFuncTest {
   }
 
 
-  @Test//( timeout = MEDIUM_TIMEOUT )
+  @Test
   public void testXForwardHeadersPopulate() throws Exception {
     LOG_ENTER();
     String username = "hdfs";
diff --git 
a/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java
 
b/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java
index e28e8d0..b444b8b 100644
--- 
a/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java
+++ 
b/gateway-test/src/test/java/org/apache/knox/gateway/deploy/DeploymentFactoryFuncTest.java
@@ -55,6 +55,8 @@ import org.xml.sax.SAXException;
 
 import static org.apache.knox.test.TestUtils.LOG_ENTER;
 import static org.apache.knox.test.TestUtils.LOG_EXIT;
+import static org.apache.knox.test.TestUtils.LONG_TIMEOUT;
+import static org.apache.knox.test.TestUtils.MEDIUM_TIMEOUT;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.hamcrest.CoreMatchers.nullValue;
@@ -68,10 +70,6 @@ import static org.junit.Assert.fail;
 
 public class DeploymentFactoryFuncTest {
 
-  private static final long SHORT_TIMEOUT = 1000L;
-  private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
-  private static final long LONG_TIMEOUT = 10 * MEDIUM_TIMEOUT;
-
   @Test( timeout = LONG_TIMEOUT )
   public void testGenericProviderDeploymentContributor() throws 
ParserConfigurationException, SAXException, IOException {
     LOG_ENTER();