Skip to content

Commit a2b0d96

Browse files
authored
fix file tests to work across multiple invocations (elastic#124412)
1 parent 958352f commit a2b0d96

File tree

1 file changed

+6
-8
lines changed
  • libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test

1 file changed

+6
-8
lines changed

libs/entitlement/qa/entitlement-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileCheckActions.java

+6-8
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,13 @@ static void fileCreateTempFile() throws IOException {
9393

9494
@EntitlementTest(expectedAccess = PLUGINS)
9595
static void fileDelete() throws IOException {
96-
Path toDelete = readWriteDir().resolve("to_delete");
97-
EntitledActions.createFile(toDelete);
96+
var toDelete = EntitledActions.createTempFileForWrite();
9897
toDelete.toFile().delete();
9998
}
10099

101100
@EntitlementTest(expectedAccess = PLUGINS)
102101
static void fileDeleteOnExit() throws IOException {
103-
Path toDelete = readWriteDir().resolve("to_delete_on_exit");
104-
EntitledActions.createFile(toDelete);
102+
var toDelete = EntitledActions.createTempFileForWrite();
105103
toDelete.toFile().deleteOnExit();
106104
}
107105

@@ -174,9 +172,10 @@ static void fileMkdirs() {
174172

175173
@EntitlementTest(expectedAccess = PLUGINS)
176174
static void fileRenameTo() throws IOException {
177-
Path toRename = readWriteDir().resolve("to_rename");
175+
var dir = EntitledActions.createTempDirectoryForWrite();
176+
Path toRename = dir.resolve("to_rename");
178177
EntitledActions.createFile(toRename);
179-
toRename.toFile().renameTo(readWriteDir().resolve("renamed").toFile());
178+
toRename.toFile().renameTo(dir.resolve("renamed").toFile());
180179
}
181180

182181
@EntitlementTest(expectedAccess = PLUGINS)
@@ -206,8 +205,7 @@ static void fileSetReadableOwner() {
206205

207206
@EntitlementTest(expectedAccess = PLUGINS)
208207
static void fileSetReadOnly() throws IOException {
209-
Path readOnly = readWriteDir().resolve("read_only");
210-
EntitledActions.createFile(readOnly);
208+
Path readOnly = EntitledActions.createTempFileForWrite();
211209
readOnly.toFile().setReadOnly();
212210
}
213211

0 commit comments

Comments
 (0)