HDFS-11132. Allow AccessControlException in contract tests when getFileStatus on subdirectory of existing files. Contributed by Vishwajeet Dusane
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19f373a4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19f373a4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19f373a4 Branch: refs/heads/YARN-5085 Commit: 19f373a46b2abb7a575f7884a9c7443b8ed67cd3 Parents: 96c5749 Author: Mingliang Liu <lium...@apache.org> Authored: Thu Dec 1 12:54:03 2016 -0800 Committer: Mingliang Liu <lium...@apache.org> Committed: Thu Dec 1 12:54:28 2016 -0800 ---------------------------------------------------------------------- .../fs/FileContextMainOperationsBaseTest.java | 21 ++++++++++++++++---- .../hadoop/fs/FileSystemContractBaseTest.java | 17 ++++++++++++++-- 2 files changed, 32 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/19f373a4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java index 5f9151a..2b3ab2a 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileContextMainOperationsBaseTest.java @@ -29,6 +29,7 @@ import org.apache.hadoop.HadoopIllegalArgumentException; import org.apache.hadoop.fs.Options.CreateOpts; import org.apache.hadoop.fs.Options.Rename; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.test.GenericTestUtils; import org.junit.After; import org.junit.Assert; @@ -251,8 +252,14 @@ public abstract class FileContextMainOperationsBaseTest { } catch (IOException e) { // expected } - Assert.assertFalse(exists(fc, testSubDir)); - + + try { + Assert.assertFalse(exists(fc, testSubDir)); + } catch (AccessControlException e) { + // Expected : HDFS-11132 Checks on paths under file may be rejected by + // file missing execute permission. + } + Path testDeepSubDir = getTestRootPath(fc, "test/hadoop/file/deep/sub/dir"); try { fc.mkdir(testDeepSubDir, FsPermission.getDefault(), true); @@ -260,8 +267,14 @@ public abstract class FileContextMainOperationsBaseTest { } catch (IOException e) { // expected } - Assert.assertFalse(exists(fc, testDeepSubDir)); - + + try { + Assert.assertFalse(exists(fc, testDeepSubDir)); + } catch (AccessControlException e) { + // Expected : HDFS-11132 Checks on paths under file may be rejected by + // file missing execute permission. + } + } @Test http://git-wip-us.apache.org/repos/asf/hadoop/blob/19f373a4/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java index bbd7336..6247959 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/FileSystemContractBaseTest.java @@ -28,6 +28,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.permission.FsPermission; +import org.apache.hadoop.security.AccessControlException; import org.apache.hadoop.util.StringUtils; /** @@ -158,7 +159,13 @@ public abstract class FileSystemContractBaseTest extends TestCase { } catch (IOException e) { // expected } - assertFalse(fs.exists(testSubDir)); + + try { + assertFalse(fs.exists(testSubDir)); + } catch (AccessControlException e) { + // Expected : HDFS-11132 Checks on paths under file may be rejected by + // file missing execute permission. + } Path testDeepSubDir = path("/test/hadoop/file/deep/sub/dir"); try { @@ -167,7 +174,13 @@ public abstract class FileSystemContractBaseTest extends TestCase { } catch (IOException e) { // expected } - assertFalse(fs.exists(testDeepSubDir)); + + try { + assertFalse(fs.exists(testDeepSubDir)); + } catch (AccessControlException e) { + // Expected : HDFS-11132 Checks on paths under file may be rejected by + // file missing execute permission. + } } --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org