Repository: hadoop Updated Branches: refs/heads/branch-2 b337a1da3 -> 9e9c3a511
HADOOP-14306. TestLocalFileSystem tests have very low timeouts. Contributed by Eric Badger (cherry picked from commit cedaf4cab9d5013acd559dcb92d4976823ccdf85) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e9c3a51 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e9c3a51 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e9c3a51 Branch: refs/heads/branch-2 Commit: 9e9c3a511cbdd2a22328610e20f7fd14b8a083d7 Parents: b337a1d Author: Jason Lowe <[email protected]> Authored: Tue May 2 16:50:51 2017 -0500 Committer: Jason Lowe <[email protected]> Committed: Tue May 2 16:52:52 2017 -0500 ---------------------------------------------------------------------- .../apache/hadoop/fs/TestLocalFileSystem.java | 37 +++++++++++++------- 1 file changed, 25 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e9c3a51/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java index d4dbf5d..a9f5a6e 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestLocalFileSystem.java @@ -40,7 +40,9 @@ import static org.mockito.Mockito.*; import org.junit.After; import org.junit.Assert; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import org.mockito.internal.util.reflection.Whitebox; @@ -56,6 +58,17 @@ public class TestLocalFileSystem { private Configuration conf; private LocalFileSystem fileSys; + /** + * standard test timeout: {@value}. + */ + public static final int DEFAULT_TEST_TIMEOUT = 60 * 1000; + + /** + * Set the timeout for every test. + */ + @Rule + public Timeout testTimeout = new Timeout(DEFAULT_TEST_TIMEOUT); + private void cleanupFile(FileSystem fs, Path name) throws IOException { assertTrue(fs.exists(name)); fs.delete(name, true); @@ -81,7 +94,7 @@ public class TestLocalFileSystem { /** * Test the capability of setting the working directory. */ - @Test(timeout = 10000) + @Test public void testWorkingDirectory() throws IOException { Path origDir = fileSys.getWorkingDirectory(); Path subdir = new Path(TEST_ROOT_DIR, "new"); @@ -135,7 +148,7 @@ public class TestLocalFileSystem { * test Syncable interface on raw local file system * @throws IOException */ - @Test(timeout = 1000) + @Test public void testSyncable() throws IOException { FileSystem fs = fileSys.getRawFileSystem(); Path file = new Path(TEST_ROOT_DIR, "syncable"); @@ -168,7 +181,7 @@ public class TestLocalFileSystem { } } - @Test(timeout = 10000) + @Test public void testCopy() throws IOException { Path src = new Path(TEST_ROOT_DIR, "dingo"); Path dst = new Path(TEST_ROOT_DIR, "yak"); @@ -194,7 +207,7 @@ public class TestLocalFileSystem { } } - @Test(timeout = 1000) + @Test public void testHomeDirectory() throws IOException { Path home = new Path(System.getProperty("user.home")) .makeQualified(fileSys); @@ -202,7 +215,7 @@ public class TestLocalFileSystem { assertEquals(home, fsHome); } - @Test(timeout = 1000) + @Test public void testPathEscapes() throws IOException { Path path = new Path(TEST_ROOT_DIR, "foo%bar"); writeFile(fileSys, path, 1); @@ -211,7 +224,7 @@ public class TestLocalFileSystem { cleanupFile(fileSys, path); } - @Test(timeout = 1000) + @Test public void testCreateFileAndMkdirs() throws IOException { Path test_dir = new Path(TEST_ROOT_DIR, "test_dir"); Path test_file = new Path(test_dir, "file1"); @@ -247,7 +260,7 @@ public class TestLocalFileSystem { } /** Test deleting a file, directory, and non-existent path */ - @Test(timeout = 1000) + @Test public void testBasicDelete() throws IOException { Path dir1 = new Path(TEST_ROOT_DIR, "dir1"); Path file1 = new Path(TEST_ROOT_DIR, "file1"); @@ -262,7 +275,7 @@ public class TestLocalFileSystem { assertTrue("Did not delete non-empty dir", fileSys.delete(dir1)); } - @Test(timeout = 1000) + @Test public void testStatistics() throws Exception { int fileSchemeCount = 0; for (Statistics stats : FileSystem.getAllStatistics()) { @@ -273,7 +286,7 @@ public class TestLocalFileSystem { assertEquals(1, fileSchemeCount); } - @Test(timeout = 1000) + @Test public void testHasFileDescriptor() throws IOException { Path path = new Path(TEST_ROOT_DIR, "test-file"); writeFile(fileSys, path, 1); @@ -283,7 +296,7 @@ public class TestLocalFileSystem { bis.close(); } - @Test(timeout = 1000) + @Test public void testListStatusWithColons() throws IOException { assumeTrue(!Shell.WINDOWS); File colonFile = new File(TEST_ROOT_DIR, "foo:bar"); @@ -309,7 +322,7 @@ public class TestLocalFileSystem { stats[0].getPath().toUri().getPath()); } - @Test(timeout = 10000) + @Test public void testReportChecksumFailure() throws IOException { base.mkdirs(); assertTrue(base.exists() && base.isDirectory()); @@ -389,7 +402,7 @@ public class TestLocalFileSystem { assertEquals(expectedAccTime, status.getAccessTime()); } - @Test(timeout = 1000) + @Test public void testSetTimes() throws Exception { Path path = new Path(TEST_ROOT_DIR, "set-times"); writeFile(fileSys, path, 1); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
