Skip to content

[9.0] fix file tests to work across multiple invocations (#124412) #124505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

[9.0] fix file tests to work across multiple invocations (#124412) #124505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions ...ent-test-plugin/src/main/java/org/elasticsearch/entitlement/qa/test/FileCheckActions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,15 +93,13 @@ static void fileCreateTempFile() throws IOException {

@EntitlementTest(expectedAccess = PLUGINS)
static void fileDelete() throws IOException {
Path toDelete = readWriteDir().resolve("to_delete");
EntitledActions.createFile(toDelete);
var toDelete = EntitledActions.createTempFileForWrite();
toDelete.toFile().delete();
}

@EntitlementTest(expectedAccess = PLUGINS)
static void fileDeleteOnExit() throws IOException {
Path toDelete = readWriteDir().resolve("to_delete_on_exit");
EntitledActions.createFile(toDelete);
var toDelete = EntitledActions.createTempFileForWrite();
toDelete.toFile().deleteOnExit();
}

Expand Down Expand Up @@ -174,9 +172,10 @@ static void fileMkdirs() {

@EntitlementTest(expectedAccess = PLUGINS)
static void fileRenameTo() throws IOException {
Path toRename = readWriteDir().resolve("to_rename");
var dir = EntitledActions.createTempDirectoryForWrite();
Path toRename = dir.resolve("to_rename");
EntitledActions.createFile(toRename);
toRename.toFile().renameTo(readWriteDir().resolve("renamed").toFile());
toRename.toFile().renameTo(dir.resolve("renamed").toFile());
}

@EntitlementTest(expectedAccess = PLUGINS)
Expand Down Expand Up @@ -206,8 +205,7 @@ static void fileSetReadableOwner() {

@EntitlementTest(expectedAccess = PLUGINS)
static void fileSetReadOnly() throws IOException {
Path readOnly = readWriteDir().resolve("read_only");
EntitledActions.createFile(readOnly);
Path readOnly = EntitledActions.createTempFileForWrite();
readOnly.toFile().setReadOnly();
}

Expand Down