HDFS-11745. Increase HDFS test timeouts from 1 second to 10 seconds. Contributed by Eric Badger

This commit is contained in:
Jason Lowe 2017-05-10 13:02:31 -05:00
parent 74a61438ca
commit fab73748a1
6 changed files with 10 additions and 10 deletions

View File

@ -749,7 +749,7 @@ public void testCommit() throws Exception {
assertEquals("Incorrect COMMIT3Response:", null, response2); assertEquals("Incorrect COMMIT3Response:", null, response2);
} }
@Test(timeout=1000) @Test(timeout=10000)
public void testIdempotent() { public void testIdempotent() {
Object[][] procedures = { Object[][] procedures = {
{ Nfs3Constant.NFSPROC3.NULL, 1 }, { Nfs3Constant.NFSPROC3.NULL, 1 },

View File

@ -34,7 +34,7 @@ public static void testSetup() throws Exception {
wrapper = new FileContextTestWrapper(fc, "/tmp/TestSymlinkHdfsFileContext"); wrapper = new FileContextTestWrapper(fc, "/tmp/TestSymlinkHdfsFileContext");
} }
@Test(timeout=1000) @Test(timeout=10000)
/** Test access a symlink using AbstractFileSystem */ /** Test access a symlink using AbstractFileSystem */
public void testAccessLinkFromAbstractFileSystem() throws IOException { public void testAccessLinkFromAbstractFileSystem() throws IOException {
Path file = new Path(testBaseDir1(), "file"); Path file = new Path(testBaseDir1(), "file");

View File

@ -35,13 +35,13 @@ public static void testSetup() throws Exception {
@Override @Override
@Ignore("FileSystem adds missing authority in absolute URIs") @Ignore("FileSystem adds missing authority in absolute URIs")
@Test(timeout=1000) @Test(timeout=10000)
public void testCreateWithPartQualPathFails() throws IOException {} public void testCreateWithPartQualPathFails() throws IOException {}
@Ignore("FileSystem#create creates parent directories," + @Ignore("FileSystem#create creates parent directories," +
" so dangling links to directories are created") " so dangling links to directories are created")
@Override @Override
@Test(timeout=1000) @Test(timeout=10000)
public void testCreateFileViaDanglingLinkParent() throws IOException {} public void testCreateFileViaDanglingLinkParent() throws IOException {}
// Additional tests for DFS-only methods // Additional tests for DFS-only methods

View File

@ -860,7 +860,7 @@ public void testGetSpnegoKeytabKey() {
DFSUtil.getSpnegoKeytabKey(conf, defaultKey)); DFSUtil.getSpnegoKeytabKey(conf, defaultKey));
} }
@Test(timeout=1000) @Test(timeout=10000)
public void testDurationToString() throws Exception { public void testDurationToString() throws Exception {
assertEquals("000:00:00:00.000", DFSUtil.durationToString(0)); assertEquals("000:00:00:00.000", DFSUtil.durationToString(0));
assertEquals("001:01:01:01.000", assertEquals("001:01:01:01.000",

View File

@ -157,7 +157,7 @@ private void readFile(FileSystem fileSys,Path name) throws IOException {
* Test that capacity metrics are exported and pass * Test that capacity metrics are exported and pass
* basic sanity tests. * basic sanity tests.
*/ */
@Test (timeout = 1800) @Test (timeout = 10000)
public void testCapacityMetrics() throws Exception { public void testCapacityMetrics() throws Exception {
MetricsRecordBuilder rb = getMetrics(NS_METRICS); MetricsRecordBuilder rb = getMetrics(NS_METRICS);
long capacityTotal = MetricsAsserts.getLongGauge("CapacityTotal", rb); long capacityTotal = MetricsAsserts.getLongGauge("CapacityTotal", rb);

View File

@ -130,7 +130,7 @@ private void checkNoTokenForOperation(HttpOpParam.Op op) throws IOException {
verify(fs, never()).setDelegationToken(any()); verify(fs, never()).setDelegationToken(any());
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testGetOpRequireAuth() { public void testGetOpRequireAuth() {
for (HttpOpParam.Op op : GetOpParam.Op.values()) { for (HttpOpParam.Op op : GetOpParam.Op.values()) {
boolean expect = (op == GetOpParam.Op.GETDELEGATIONTOKEN); boolean expect = (op == GetOpParam.Op.GETDELEGATIONTOKEN);
@ -138,7 +138,7 @@ public void testGetOpRequireAuth() {
} }
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testPutOpRequireAuth() { public void testPutOpRequireAuth() {
for (HttpOpParam.Op op : PutOpParam.Op.values()) { for (HttpOpParam.Op op : PutOpParam.Op.values()) {
boolean expect = (op == PutOpParam.Op.RENEWDELEGATIONTOKEN || op == PutOpParam.Op.CANCELDELEGATIONTOKEN); boolean expect = (op == PutOpParam.Op.RENEWDELEGATIONTOKEN || op == PutOpParam.Op.CANCELDELEGATIONTOKEN);
@ -146,14 +146,14 @@ public void testPutOpRequireAuth() {
} }
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testPostOpRequireAuth() { public void testPostOpRequireAuth() {
for (HttpOpParam.Op op : PostOpParam.Op.values()) { for (HttpOpParam.Op op : PostOpParam.Op.values()) {
assertFalse(op.getRequireAuth()); assertFalse(op.getRequireAuth());
} }
} }
@Test(timeout = 1000) @Test(timeout = 10000)
public void testDeleteOpRequireAuth() { public void testDeleteOpRequireAuth() {
for (HttpOpParam.Op op : DeleteOpParam.Op.values()) { for (HttpOpParam.Op op : DeleteOpParam.Op.values()) {
assertFalse(op.getRequireAuth()); assertFalse(op.getRequireAuth());