You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by km...@apache.org on 2016/03/07 20:37:54 UTC
knox git commit: [KNOX-684] - Increase test timeouts for failing tests
Repository: knox
Updated Branches:
refs/heads/master 6f7bd2339 -> 8008d559c
[KNOX-684] - Increase test timeouts for failing tests
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/8008d559
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/8008d559
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/8008d559
Branch: refs/heads/master
Commit: 8008d559c6b6ba15b55e711ad262530ef4300948
Parents: 6f7bd23
Author: Kevin Minder <km...@apache.org>
Authored: Mon Mar 7 14:25:02 2016 -0500
Committer: Kevin Minder <km...@apache.org>
Committed: Mon Mar 7 14:25:02 2016 -0500
----------------------------------------------------------------------
.../hadoop/gateway/GatewayAdminFuncTest.java | 6 +-
.../hadoop/gateway/GatewayBasicFuncTest.java | 78 ++++++++++----------
2 files changed, 38 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/8008d559/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
----------------------------------------------------------------------
diff --git a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
index 6835d3d..9762a81 100644
--- a/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
+++ b/gateway-test/src/test/java/org/apache/hadoop/gateway/GatewayAdminFuncTest.java
@@ -52,10 +52,6 @@ import static org.junit.Assert.assertThat;
public class GatewayAdminFuncTest {
- private static final long SHORT_TIMEOUT = 1000L;
- private static final long MEDIUM_TIMEOUT = 5 * SHORT_TIMEOUT;
- private static final long LONG_TIMEOUT = 5 * MEDIUM_TIMEOUT;
-
private static Class RESOURCE_BASE_CLASS = GatewayAdminFuncTest.class;
private static Logger LOG = LoggerFactory.getLogger( GatewayAdminFuncTest.class );
@@ -193,7 +189,7 @@ public class GatewayAdminFuncTest {
System.in.read();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testAdminService() throws ClassNotFoundException {
TestUtils.LOG_ENTER();
http://git-wip-us.apache.org/repos/asf/knox/blob/8008d559/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 892c383..5dab849 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
@@ -87,10 +87,6 @@ import static uk.co.datumedge.hamcrest.json.SameJSONAs.sameJSONAs;
@Category( { VerifyTest.class, MediumTests.class } )
public class GatewayBasicFuncTest {
- 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");
// Uncomment to cause the test to hang after the gateway instance is setup.
@@ -262,7 +258,7 @@ public class GatewayBasicFuncTest {
return xml;
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testBasicJsonUseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testBasicJsonUseCase";
@@ -308,7 +304,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testBasicOutboundHeaderUseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testBasicOutboundHeaderUseCase";
@@ -351,7 +347,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHdfsTildeUseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testHdfsTildeUseCase";
@@ -409,7 +405,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testBasicHdfsUseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testBasicHdfsUseCase";
@@ -696,7 +692,7 @@ public class GatewayBasicFuncTest {
// User hdfs in groups hadoop, hdfs
// User mapred in groups hadoop, mapred
// User hcat in group hcat
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testPmHdfsM1UseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testPmHdfdM1UseCase";
@@ -807,7 +803,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testJavaMapReduceViaWebHCat() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testJavaMapReduceViaWebHCat";
@@ -863,7 +859,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testPigViaWebHCat() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayWebHCatFuncTest/testPigViaWebHCat";
@@ -894,7 +890,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHiveViaWebHCat() throws IOException {
LOG_ENTER();
String user = "hive";
@@ -921,7 +917,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testOozieJobSubmission() throws Exception {
LOG_ENTER();
String root = "/tmp/GatewayBasicFuncTest/testOozieJobSubmission";
@@ -998,7 +994,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testBasicHiveJDBCUseCase() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayHiveJDBCFuncTest/testBasicHiveUseCase";
@@ -1401,7 +1397,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseGetTableList() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -1479,7 +1475,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseCreateTableAndVerifySchema() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -1550,7 +1546,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseGetTableSchema() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -1631,7 +1627,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseInsertDataIntoTable() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -1771,7 +1767,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseDeleteDataFromTable() {
LOG_ENTER();
String username = "hbase";
@@ -1833,7 +1829,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseQueryTableData() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -1944,7 +1940,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testHBaseUseScanner() throws IOException {
LOG_ENTER();
String username = "hbase";
@@ -2021,7 +2017,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testCrossSiteRequestForgeryPreventionPUT() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayWebHdfsFuncTest/testCrossSiteRequestForgeryPrevention";
@@ -2040,7 +2036,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testCrossSiteRequestForgeryPreventionGET() throws IOException {
LOG_ENTER();
String root = "/tmp/GatewayWebHdfsFuncTest/testCrossSiteRequestForgeryPrevention";
@@ -2069,7 +2065,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmGetClusterInfo() throws Exception {
LOG_ENTER();
getYarnRmResource( "/v1/cluster/", ContentType.JSON, "yarn/cluster-info" );
@@ -2079,7 +2075,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmGetClusterMetrics() throws Exception {
LOG_ENTER();
getYarnRmResource( "/v1/cluster/metrics/", ContentType.JSON, "yarn/cluster-metrics" );
@@ -2087,7 +2083,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRnGetScheduler() throws Exception {
LOG_ENTER();
getYarnRmResource( "/v1/cluster/scheduler/", ContentType.JSON, "yarn/scheduler" );
@@ -2095,7 +2091,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void getYarnRmAppstatistics() throws Exception {
LOG_ENTER();
getYarnRmResource( "/v1/cluster/appstatistics/", ContentType.JSON, "yarn/appstatistics" );
@@ -2103,7 +2099,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmGetApplications() throws Exception {
LOG_ENTER();
getYarnRmApps( ContentType.XML, null );
@@ -2197,7 +2193,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnApplicationLifecycle() throws Exception {
LOG_ENTER();
String username = "hdfs";
@@ -2405,7 +2401,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmAppattempts() throws Exception {
LOG_ENTER();
getYarnRmAppattempts( ContentType.JSON );
@@ -2456,7 +2452,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmNodes() throws Exception {
LOG_ENTER();
getYarnRmNodes( ContentType.JSON, null );
@@ -2545,7 +2541,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testYarnRmProxy() throws Exception {
LOG_ENTER();
String username = "hdfs";
@@ -2824,7 +2820,7 @@ public class GatewayBasicFuncTest {
return file.toURI().toString();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testFalconAdmin() throws Exception {
LOG_ENTER();
String resourceName = "falcon/version";
@@ -2876,7 +2872,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testFalconEntities() throws Exception {
LOG_ENTER();
String resourceName = "falcon/entity-status-process";
@@ -2931,7 +2927,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testFalconFeedAndProcess() throws Exception {
LOG_ENTER();
String resourceName = "falcon/instance-running-process";
@@ -2948,7 +2944,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testFalconMetadataLineage() throws Exception {
LOG_ENTER();
String resourceName = "falcon/metadata-lineage-vertices-all";
@@ -3002,7 +2998,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testFalconMetadataDiscovery() throws Exception {
LOG_ENTER();
String resourceName = "falcon/metadata-disc-process-entity";
@@ -3138,7 +3134,7 @@ public class GatewayBasicFuncTest {
driver.assertComplete();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testStormUiApi() throws Exception {
LOG_ENTER();
String resourceName = "storm/cluster-configuration.json";
@@ -3350,7 +3346,7 @@ public class GatewayBasicFuncTest {
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testXForwardHeadersRewrite() throws Exception {
LOG_ENTER();
String username = "hdfs";
@@ -3490,7 +3486,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testServiceTestAPI() throws Exception {
LOG_ENTER();
@@ -3592,7 +3588,7 @@ public class GatewayBasicFuncTest {
LOG_EXIT();
}
- @Test( timeout = MEDIUM_TIMEOUT )
+ @Test( timeout = TestUtils.MEDIUM_TIMEOUT )
public void testCLIServiceTest() throws Exception {
LOG_ENTER();