Repository: hadoop Updated Branches: refs/heads/branch-2 48b5faa70 -> 0a4021387
HDFS-11745. Increase HDFS test timeouts from 1 second to 10 seconds. Contributed by Eric Badger (cherry picked from commit fab73748a1ce982904d332e6ddd46169f186ad54) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a402138 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a402138 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a402138 Branch: refs/heads/branch-2 Commit: 0a4021387f2545319e3cf4d45569731d261b39bb Parents: 48b5faa 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:03:33 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/0a402138/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/0a402138/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/0a402138/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/0a402138/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 6c10a67..b29cddc 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 @@ -861,7 +861,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/0a402138/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 f8af370..c22cd11 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 @@ -163,7 +163,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/0a402138/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 2802cb7..88980d9 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 @@ -131,7 +131,7 @@ public class TestWebHdfsTokens { verify(fs, never()).setDelegationToken((Token<?>)any(Token.class)); } - @Test(timeout = 1000) + @Test(timeout = 10000) public void testGetOpRequireAuth() { for (HttpOpParam.Op op : GetOpParam.Op.values()) { boolean expect = (op == GetOpParam.Op.GETDELEGATIONTOKEN); @@ -139,7 +139,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); @@ -147,14 +147,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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
