diff options
author | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-04-20 15:01:22 +0200 |
---|---|---|
committer | Valerij Fredriksen <valerijf@yahooinc.com> | 2022-04-20 15:01:22 +0200 |
commit | d5ecbb1d6e155b4b09306207f03fb26649491e83 (patch) | |
tree | cbcf42de0afe103f860c093fc51e3ac296449ab3 /node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java | |
parent | 67c73b131aa7cd482e398e27687a80518f401a7a (diff) |
Revert "Set default permissions"
This reverts commit 228b5c7146255f95b80e4a233948acb316718b81.
Diffstat (limited to 'node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java')
-rw-r--r-- | node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java index b26f0fe5bf8..c3affccc32b 100644 --- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java +++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java @@ -16,8 +16,6 @@ import java.nio.file.LinkOption; import java.nio.file.Path; import java.nio.file.StandardCopyOption; import java.nio.file.StandardOpenOption; -import java.nio.file.attribute.FileAttribute; -import java.nio.file.attribute.PosixFilePermissions; import java.util.Map; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -176,19 +174,6 @@ class ContainerFileSystemTest { Files.writeString(file.pathOnHost(), "hello"); // Writing through host FS works } - @Test - public void permissions() throws IOException { - assertPermissions(Files.createDirectory(containerFs.getPath("/dir1")), "rwxr-x---"); - assertPermissions(Files.createDirectory(containerFs.getPath("/dir2"), permissionsFromString("r-x-w-rw-")), "r-x-w-rw-"); - - assertPermissions(Files.createDirectories(containerFs.getPath("/sub/dir/leaf"), permissionsFromString("r-x-w-rw-")), "r-x-w-rw-"); - assertPermissions(containerFs.getPath("/sub/dir"), "r-x-w-rw-"); // Non-leafs get the same permission as the leaf - - // TODO: Uncomment when JimFS forwards attributes for SecureDirectoryStream::newByteChannel -// assertPermissions(Files.createFile(containerFs.getPath("/file1")), "rw-r-----"); -// assertPermissions(Files.createFile(containerFs.getPath("/file2"), permissionsFromString("r-x-w-rw-")), "r-x-w-rw-"); - } - private static void assertOwnership(ContainerPath path, int contUid, int contGid, int hostUid, int hostGid) throws IOException { assertOwnership(path, contUid, contGid); assertOwnership(path.pathOnHost(), hostUid, hostGid); @@ -199,13 +184,4 @@ class ContainerFileSystemTest { assertEquals(uid, attrs.get("uid")); assertEquals(gid, attrs.get("gid")); } - - private static void assertPermissions(Path path, String expected) throws IOException { - String actual = PosixFilePermissions.toString(Files.getPosixFilePermissions(path)); - assertEquals(expected, actual); - } - - private static FileAttribute<?> permissionsFromString(String permissions) { - return PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString(permissions)); - } } |