summaryrefslogtreecommitdiffstats
path: root/node-admin/src/test/java/com
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2022-04-21 13:01:33 +0200
committerGitHub <noreply@github.com>2022-04-21 13:01:33 +0200
commit26d7ba296e48d59647c0fc1567295ede87cdc0a3 (patch)
tree24cbbec6414e3bbdaaa30eba71de31257e9c12f4 /node-admin/src/test/java/com
parent888beccd43a3bb14febb0c2d2838e0dda852593c (diff)
Revert "Reapply "Set default permissions""
Diffstat (limited to 'node-admin/src/test/java/com')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/fs/ContainerFileSystemTest.java24
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));
- }
}