You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2017/05/10 18:03:23 UTC
hadoop git commit: HDFS-11745. Increase HDFS test timeouts from 1
second to 10 seconds. Contributed by Eric Badger
Repository: hadoop
Updated Branches:
refs/heads/trunk 74a61438c -> fab73748a
HDFS-11745. Increase HDFS test timeouts from 1 second to 10 seconds. Contributed by Eric Badger
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fab73748
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fab73748
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fab73748
Branch: refs/heads/trunk
Commit: fab73748a1ce982904d332e6ddd46169f186ad54
Parents: 74a6143
Author: Jason Lowe <jl...@yahoo-inc.com>
Authored: Wed May 10 13:02:31 2017 -0500
Committer: Jason Lowe <jl...@yahoo-inc.com>
Committed: Wed May 10 13:02:31 2017 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 2 +-
.../org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java | 2 +-
.../java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java | 4 ++--
.../src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java | 2 +-
.../hdfs/server/namenode/metrics/TestNameNodeMetrics.java | 2 +-
.../java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java | 8 ++++----
6 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
index 0fabb30..f308763 100644
--- a/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
+++ b/hadoop-hdfs-project/hadoop-hdfs-nfs/src/test/java/org/apache/hadoop/hdfs/nfs/nfs3/TestRpcProgramNfs3.java
@@ -749,7 +749,7 @@ public class TestRpcProgramNfs3 {
assertEquals("Incorrect COMMIT3Response:", null, response2);
}
- @Test(timeout=1000)
+ @Test(timeout=10000)
public void testIdempotent() {
Object[][] procedures = {
{ Nfs3Constant.NFSPROC3.NULL, 1 },
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java
index d94a514..2a3e4c3 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileContext.java
@@ -34,7 +34,7 @@ public class TestSymlinkHdfsFileContext extends TestSymlinkHdfs {
wrapper = new FileContextTestWrapper(fc, "/tmp/TestSymlinkHdfsFileContext");
}
- @Test(timeout=1000)
+ @Test(timeout=10000)
/** Test access a symlink using AbstractFileSystem */
public void testAccessLinkFromAbstractFileSystem() throws IOException {
Path file = new Path(testBaseDir1(), "file");
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java
index bf42e24..fba9c42 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/fs/TestSymlinkHdfsFileSystem.java
@@ -35,13 +35,13 @@ public class TestSymlinkHdfsFileSystem extends TestSymlinkHdfs {
@Override
@Ignore("FileSystem adds missing authority in absolute URIs")
- @Test(timeout=1000)
+ @Test(timeout=10000)
public void testCreateWithPartQualPathFails() throws IOException {}
@Ignore("FileSystem#create creates parent directories," +
" so dangling links to directories are created")
@Override
- @Test(timeout=1000)
+ @Test(timeout=10000)
public void testCreateFileViaDanglingLinkParent() throws IOException {}
// Additional tests for DFS-only methods
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
index 14ad6dd..f811d3d 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestDFSUtil.java
@@ -860,7 +860,7 @@ public class TestDFSUtil {
DFSUtil.getSpnegoKeytabKey(conf, defaultKey));
}
- @Test(timeout=1000)
+ @Test(timeout=10000)
public void testDurationToString() throws Exception {
assertEquals("000:00:00:00.000", DFSUtil.durationToString(0));
assertEquals("001:01:01:01.000",
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
index b9d25b2..3974d0b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/metrics/TestNameNodeMetrics.java
@@ -157,7 +157,7 @@ public class TestNameNodeMetrics {
* Test that capacity metrics are exported and pass
* basic sanity tests.
*/
- @Test (timeout = 1800)
+ @Test (timeout = 10000)
public void testCapacityMetrics() throws Exception {
MetricsRecordBuilder rb = getMetrics(NS_METRICS);
long capacityTotal = MetricsAsserts.getLongGauge("CapacityTotal", rb);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fab73748/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
index 24de8ac..1862f76 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/web/TestWebHdfsTokens.java
@@ -130,7 +130,7 @@ public class TestWebHdfsTokens {
verify(fs, never()).setDelegationToken(any());
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testGetOpRequireAuth() {
for (HttpOpParam.Op op : GetOpParam.Op.values()) {
boolean expect = (op == GetOpParam.Op.GETDELEGATIONTOKEN);
@@ -138,7 +138,7 @@ public class TestWebHdfsTokens {
}
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testPutOpRequireAuth() {
for (HttpOpParam.Op op : PutOpParam.Op.values()) {
boolean expect = (op == PutOpParam.Op.RENEWDELEGATIONTOKEN || op == PutOpParam.Op.CANCELDELEGATIONTOKEN);
@@ -146,14 +146,14 @@ public class TestWebHdfsTokens {
}
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testPostOpRequireAuth() {
for (HttpOpParam.Op op : PostOpParam.Op.values()) {
assertFalse(op.getRequireAuth());
}
}
- @Test(timeout = 1000)
+ @Test(timeout = 10000)
public void testDeleteOpRequireAuth() {
for (HttpOpParam.Op op : DeleteOpParam.Op.values()) {
assertFalse(op.getRequireAuth());
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org