aboutsummaryrefslogtreecommitdiffstats
path: root/node-admin/src/test
diff options
context:
space:
mode:
authorHåkon Hallingstad <hakon@yahooinc.com>2022-12-06 11:48:42 +0100
committerHåkon Hallingstad <hakon@yahooinc.com>2022-12-06 11:48:42 +0100
commit0f5e8e8784bf52c7e3a9d5a3796179f1d88be019 (patch)
treec5cd4d7f8078dcb7b53b6e63a8e4f24df5114fad /node-admin/src/test
parent87bb10ce865023969e89692896a6e0236e4fdc73 (diff)
Create file with correct permissions
Diffstat (limited to 'node-admin/src/test')
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java5
-rw-r--r--node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileWriterTest.java2
2 files changed, 3 insertions, 4 deletions
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
index 5c7becdb9f1..de14168a14e 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileSyncTest.java
@@ -29,10 +29,9 @@ public class FileSyncTest {
@Test
void trivial() {
- assertConvergence("Creating file /dir/file.txt",
+ assertConvergence("Creating file /dir/file.txt with permissions rw-r-xr--",
"Changing user ID of /dir/file.txt from 1 to 123",
- "Changing group ID of /dir/file.txt from 2 to 456",
- "Changing permissions of /dir/file.txt from rw-r--r-- to rw-r-xr--");
+ "Changing group ID of /dir/file.txt from 2 to 456");
content = "new-content";
assertConvergence("Patching file /dir/file.txt");
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileWriterTest.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileWriterTest.java
index 03f91c5d48a..159185a2c0c 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileWriterTest.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/task/util/file/FileWriterTest.java
@@ -35,7 +35,7 @@ public class FileWriterTest {
.withGroupId(group)
.onlyIfFileDoesNotAlreadyExist();
assertTrue(writer.converge(context));
- verify(context, times(1)).recordSystemModification(any(), eq("Creating file " + path));
+ verify(context, times(1)).recordSystemModification(any(), eq("Creating file " + path + " with permissions rwxr-xr-x"));
UnixPath unixPath = new UnixPath(path);
assertEquals(content, unixPath.readUtf8File());