knox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmin...@apache.org
Subject knox git commit: KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. More debugging and timeout changes.
Date Mon, 09 Nov 2015 16:07:46 GMT
Repository: knox
Updated Branches:
  refs/heads/master 8cd9b40fc -> d5a875982


KNOX-620: Jenkins Knox-master-verify failing since #725 due to JDK version issues. More debugging
and timeout changes.


Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/d5a87598
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/d5a87598
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/d5a87598

Branch: refs/heads/master
Commit: d5a875982b6ae2acc8028185bf88d312e124cb91
Parents: 8cd9b40
Author: Kevin Minder <kevin.minder@hortonworks.com>
Authored: Mon Nov 9 11:07:41 2015 -0500
Committer: Kevin Minder <kevin.minder@hortonworks.com>
Committed: Mon Nov 9 11:07:41 2015 -0500

----------------------------------------------------------------------
 .../gateway/deploy/DeploymentFactory.java       |  4 +-
 .../hadoop/gateway/GatewayBasicFuncTest.java    | 74 ++++++++++----------
 .../hadoop/gateway/GatewaySampleFuncTest.java   |  3 +-
 .../apache/hadoop/gateway/Knox242FuncTest.java  |  2 +-
 .../hadoop/gateway/WebHdfsHaFuncTest.java       | 18 ++---
 .../deploy/DeploymentFactoryFuncTest.java       |  6 +-
 .../src/test/resources/log4j.properties         |  4 +-
 pom.xml                                         |  2 +-
 8 files changed, 56 insertions(+), 57 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
----------------------------------------------------------------------
diff --git a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
index 67af3ab..e5d75d5 100644
--- a/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
+++ b/gateway-server/src/main/java/org/apache/hadoop/gateway/deploy/DeploymentFactory.java
@@ -253,6 +253,7 @@ public abstract class DeploymentFactory {
       for( ProviderDeploymentContributor contributor : providers.get( role ) ) {
         try {
           injectServices(contributor);
+          log.initializeProvider( contributor.getName(), contributor.getRole() );
           contributor.initializeContribution( context );
         } catch( Exception e ) {
           log.failedToInitializeContribution( e );
@@ -264,6 +265,7 @@ public abstract class DeploymentFactory {
       for( ServiceDeploymentContributor contributor : services.get( role ) ) {
         try {
           injectServices(contributor);
+          log.initializeService( contributor.getName(), contributor.getRole() );
           contributor.initializeContribution( context );
         } catch( Exception e ) {
           log.failedToInitializeContribution( e );
@@ -326,7 +328,6 @@ public abstract class DeploymentFactory {
               sr.registerService(regCode, topology.getName(), service.getRole(), service.getUrls()
);
             }
           }
-          log.initializeProvider( contributor.getName(), contributor.getRole() );
         } catch( Exception e ) {
           // Maybe it makes sense to throw exception
           log.failedToContributeService( service.getName(), service.getRole(), e );
@@ -401,7 +402,6 @@ public abstract class DeploymentFactory {
             log.failedToFinalizeContribution( e );
             throw new DeploymentException("Failed to finalize contribution.", e);
           }
-          log.initializeService( contributor.getName(), contributor.getRole() );
         }
       }
       for( String role : services.keySet() ) {

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
index 2c4bd3a..70651e2 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayBasicFuncTest.java
@@ -83,9 +83,9 @@ import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
 @Category( { FunctionalTests.class, MediumTests.class } )
 public class GatewayBasicFuncTest {
 
-  private static final long SHORT_TIMEOUT = 2000L;
-  private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
-  private static final long LONG_TIMEOUT = 5 * MEDIUM_TIMEOUT;
+  private static final long SHORT_TIMEOUT = 1000L;
+  private static final long MEDIUM_TIMEOUT = 10 * SHORT_TIMEOUT;
+  private static final long LONG_TIMEOUT = 10 * MEDIUM_TIMEOUT;
 
   private static final Charset UTF8 = Charset.forName("UTF-8");
 
@@ -138,7 +138,7 @@ public class GatewayBasicFuncTest {
    */
   @BeforeClass
   public static void setupSuite() throws Exception {
-    Log.setLog( new NoOpLogger() );
+    //Log.setLog( new NoOpLogger() );
     LOG_ENTER();
     GatewayTestConfig config = new GatewayTestConfig();
     config.setGatewayPath( "gateway" );
@@ -264,7 +264,7 @@ public class GatewayBasicFuncTest {
     return xml;
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testBasicJsonUseCase() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayBasicFuncTest/testBasicJsonUseCase";
@@ -310,7 +310,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testBasicOutboundHeaderUseCase() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayBasicFuncTest/testBasicOutboundHeaderUseCase";
@@ -410,7 +410,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testBasicHdfsUseCase() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayBasicFuncTest/testBasicHdfsUseCase";
@@ -808,7 +808,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testJavaMapReduceViaWebHCat() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayBasicFuncTest/testJavaMapReduceViaWebHCat";
@@ -864,7 +864,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testPigViaWebHCat() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayWebHCatFuncTest/testPigViaWebHCat";
@@ -895,7 +895,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHiveViaWebHCat() throws IOException {
     LOG_ENTER();
     String user = "hive";
@@ -999,7 +999,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testBasicHiveJDBCUseCase() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayHiveJDBCFuncTest/testBasicHiveUseCase";
@@ -1402,7 +1402,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseGetTableList() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -1480,7 +1480,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseCreateTableAndVerifySchema() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -1551,7 +1551,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseGetTableSchema() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -1632,7 +1632,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseInsertDataIntoTable() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -1772,7 +1772,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseDeleteDataFromTable() {
     LOG_ENTER();
     String username = "hbase";
@@ -1834,7 +1834,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseQueryTableData() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -1945,7 +1945,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testHBaseUseScanner() throws IOException {
     LOG_ENTER();
     String username = "hbase";
@@ -2022,7 +2022,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testCrossSiteRequestForgeryPreventionPUT() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayWebHdfsFuncTest/testCrossSiteRequestForgeryPrevention";
@@ -2041,7 +2041,7 @@ public class GatewayBasicFuncTest {
     driver.assertComplete();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testCrossSiteRequestForgeryPreventionGET() throws IOException {
     LOG_ENTER();
     String root = "/tmp/GatewayWebHdfsFuncTest/testCrossSiteRequestForgeryPrevention";
@@ -2070,7 +2070,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRmGetClusterInfo() throws Exception {
     LOG_ENTER();
     getYarnRmResource( "/v1/cluster/", ContentType.JSON, "yarn/cluster-info" );
@@ -2080,7 +2080,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRmGetClusterMetrics() throws Exception {
     LOG_ENTER();
     getYarnRmResource( "/v1/cluster/metrics/", ContentType.JSON, "yarn/cluster-metrics" );
@@ -2088,7 +2088,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRnGetScheduler() throws Exception {
     LOG_ENTER();
     getYarnRmResource( "/v1/cluster/scheduler/", ContentType.JSON, "yarn/scheduler" );
@@ -2096,7 +2096,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void getYarnRmAppstatistics() throws Exception {
     LOG_ENTER();
     getYarnRmResource( "/v1/cluster/appstatistics/", ContentType.JSON, "yarn/appstatistics"
);
@@ -2104,7 +2104,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRmGetApplications() throws Exception {
     LOG_ENTER();
     getYarnRmApps( ContentType.XML, null );
@@ -2129,7 +2129,6 @@ public class GatewayBasicFuncTest {
   }
 
   private void getYarnRmApps( ContentType contentType, Map<String,String> params )
throws Exception {
-    LOG_ENTER();
     String username = "hdfs";
     String password = "hdfs-password";
     String path = "/v1/cluster/apps/";
@@ -2197,10 +2196,9 @@ public class GatewayBasicFuncTest {
         .get(gatewayPath + gatewayPathQuery);
 
     driver.assertComplete();
-    LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnApplicationLifecycle() throws Exception {
     LOG_ENTER();
     String username = "hdfs";
@@ -2270,7 +2268,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRmApplication() throws Exception {
     LOG_ENTER();
     getYarnRmApp( ContentType.JSON, true );
@@ -2412,7 +2410,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testYarnRmAppattempts() throws Exception {
     LOG_ENTER();
     getYarnRmAppattempts( ContentType.JSON );
@@ -2835,7 +2833,7 @@ public class GatewayBasicFuncTest {
     return file.toURI().toString();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testFalconAdmin() throws Exception {
     LOG_ENTER();
     String resourceName = "falcon/version";
@@ -2887,7 +2885,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testFalconEntities() throws Exception {
     LOG_ENTER();
     String resourceName = "falcon/entity-status-process";
@@ -2942,7 +2940,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testFalconFeedAndProcess() throws Exception {
     LOG_ENTER();
     String resourceName = "falcon/instance-running-process";
@@ -2959,7 +2957,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testFalconMetadataLineage() throws Exception {
     LOG_ENTER();
     String resourceName = "falcon/metadata-lineage-vertices-all";
@@ -3013,7 +3011,7 @@ public class GatewayBasicFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testFalconMetadataDiscovery() throws Exception {
     LOG_ENTER();
     String resourceName = "falcon/metadata-disc-process-entity";
@@ -3149,7 +3147,7 @@ public class GatewayBasicFuncTest {
     driver.assertComplete();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testStormUiApi() throws Exception {
     LOG_ENTER();
     String resourceName = "storm/cluster-configuration.json";
@@ -3310,7 +3308,7 @@ public class GatewayBasicFuncTest {
   }
 
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testXForwardHeadersPopulate() throws Exception {
     LOG_ENTER();
     String username = "hdfs";
@@ -3361,7 +3359,7 @@ public class GatewayBasicFuncTest {
   }
 
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testXForwardHeadersRewrite() throws Exception {
     LOG_ENTER();
     String username = "hdfs";

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
index 1ebf7fe..de406df 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewaySampleFuncTest.java
@@ -56,6 +56,7 @@ import static org.junit.Assert.assertThat;
 public class GatewaySampleFuncTest {
 
   private static final long SHORT_TIMEOUT = 1000L;
+  private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
 
   private static Class RESOURCE_BASE_CLASS = GatewaySampleFuncTest.class;
   private static Logger LOG = LoggerFactory.getLogger( GatewaySampleFuncTest.class );
@@ -201,7 +202,7 @@ public class GatewaySampleFuncTest {
     System.in.read();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
   public void testTestService() throws ClassNotFoundException {
     LOG_ENTER();
     String username = "guest";

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
index b7e0782..4e0c9c7 100755
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/Knox242FuncTest.java
@@ -69,7 +69,7 @@ import com.mycila.xmltool.XMLTag;
 public class Knox242FuncTest {
 
   private static final long SHORT_TIMEOUT = 1000L;
-  private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
+  private static final long MEDIUM_TIMEOUT = 10 * SHORT_TIMEOUT;
 
   private static Class RESOURCE_BASE_CLASS = Knox242FuncTest.class;
   private static Logger LOG = LoggerFactory.getLogger( Knox242FuncTest.class );

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java
index 8dd9396..7823978 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/WebHdfsHaFuncTest.java
@@ -43,7 +43,7 @@ import static org.hamcrest.CoreMatchers.is;
 public class WebHdfsHaFuncTest {
 
    private static final long SHORT_TIMEOUT = 1000L;
-   private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
+   private static final long MEDIUM_TIMEOUT = 10 * SHORT_TIMEOUT;
 
    // Specifies if the test requests should go through the gateway or directly to the services.
    // This is frequently used to verify the behavior of the test both with and without the
gateway.
@@ -80,7 +80,7 @@ public class WebHdfsHaFuncTest {
    @Before
    public void setup() throws Exception {
       LOG_ENTER();
-      Log.setLog(new NoOpLogger());
+      //Log.setLog(new NoOpLogger());
       masterServer = new MockServer("master", true);
       standbyServer = new MockServer("standby", true);
       GatewayTestConfig config = new GatewayTestConfig();
@@ -166,7 +166,7 @@ public class WebHdfsHaFuncTest {
       return xml;
    }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = MEDIUM_TIMEOUT )
    public void testBasicListOperation() throws IOException {
       LOG_ENTER();
       String username = "hdfs";
@@ -193,7 +193,7 @@ public class WebHdfsHaFuncTest {
       LOG_EXIT();
    }
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    @Ignore( "KNOX-446" )
    public void testFailoverListOperation() throws Exception {
       LOG_ENTER();
@@ -224,7 +224,7 @@ public class WebHdfsHaFuncTest {
       LOG_EXIT();
    }
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    public void testFailoverLimit() throws Exception {
       LOG_ENTER();
       String username = "hdfs";
@@ -246,7 +246,7 @@ public class WebHdfsHaFuncTest {
    }
 
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    @Ignore( "KNOX-446" )
    public void testServerInStandby() throws IOException {
       LOG_ENTER();
@@ -286,7 +286,7 @@ public class WebHdfsHaFuncTest {
       LOG_EXIT();
    }
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    public void testServerInStandbyFailoverLimit() throws IOException {
       LOG_ENTER();
       String username = "hdfs";
@@ -341,7 +341,7 @@ public class WebHdfsHaFuncTest {
       LOG_EXIT();
    }
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    public void testServerInSafeMode() throws IOException {
       LOG_ENTER();
       String username = "hdfs";
@@ -381,7 +381,7 @@ public class WebHdfsHaFuncTest {
       LOG_EXIT();
    }
 
-   @Test( timeout = SHORT_TIMEOUT )
+   @Test( timeout = MEDIUM_TIMEOUT )
    public void testServerInSafeModeRetriableException() throws IOException {
       LOG_ENTER();
       String username = "hdfs";

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
index b7d6dba..a23e675 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/deploy/DeploymentFactoryFuncTest.java
@@ -71,8 +71,8 @@ import static org.junit.Assert.fail;
 public class DeploymentFactoryFuncTest {
 
   private static final long SHORT_TIMEOUT = 1000L;
-  private static final long MEDIUM_TIMEOUT = 5 * 1000L;
-  private static final long LONG_TIMEOUT = 15 * 1000L;
+  private static final long MEDIUM_TIMEOUT = 10 * SHORT_TIMEOUT;
+  private static final long LONG_TIMEOUT = 10 * MEDIUM_TIMEOUT;
 
   @Test( timeout = SHORT_TIMEOUT )
   public void testGenericProviderDeploymentContributor() throws ParserConfigurationException,
SAXException, IOException, TransformerException {
@@ -140,7 +140,7 @@ public class DeploymentFactoryFuncTest {
     LOG_EXIT();
   }
 
-  @Test( timeout = SHORT_TIMEOUT )
+  @Test( timeout = LONG_TIMEOUT )
   public void testInvalidGenericProviderDeploymentContributor() throws ParserConfigurationException,
SAXException, IOException, TransformerException {
     LOG_ENTER();
     GatewayConfig config = new GatewayTestConfig();

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/gateway-test/src/test/resources/log4j.properties
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/resources/log4j.properties b/gateway-test/src/test/resources/log4j.properties
index 37e9775..627ec61 100644
--- a/gateway-test/src/test/resources/log4j.properties
+++ b/gateway-test/src/test/resources/log4j.properties
@@ -23,8 +23,8 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%5p [%c] %m%n
 
-log4j.logger.org.apache.hadoop.gateway=INFO
-#log4j.logger.org.apache.directory=DEBUG
+log4j.logger.org.apache.hadoop.gateway=DEBUG
+log4j.logger.org.apache.directory=ERROR
 
 #log4j.logger.org.eclipse.jetty=DEBUG
 #log4j.logger.org.apache.shiro=DEBUG

http://git-wip-us.apache.org/repos/asf/knox/blob/d5a87598/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ec67670..dd3c640 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1042,7 +1042,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.11</version>
+                <version>4.12</version>
             </dependency>
 
             <dependency>


Mime
View raw message