-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Fix FileAccessTreeTests#testDuplicateExclusivePaths to work on windows #124430
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.
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
ldematte
merged 7 commits into
elastic:main
from
ldematte:entitlements/fix-testDuplicateExclusivePaths
Mar 10, 2025
Merged
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
9549dd8
fix FileAccessTreeTests#testDuplicateExclusivePaths to work on window…
ldematte 8925c0e
Merge remote-tracking branch 'upstream/main' into entitlements/fix-te…
ldematte 27f4142
Fix testFilesEntitlementsWithExclusive too and unmute tests
ldematte 8dcbc21
[CI] Auto commit changes from spotless
778ab21
Merge remote-tracking branch 'upstream/main' into entitlements/fix-te…
ldematte 1c69046
revert PolicyManagerTests change
ldematte b6f7664
Merge branch 'entitlements/fix-testDuplicateExclusivePaths' of github…
ldematte File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -447,7 +447,9 @@ public void testDuplicateEntitlements() { | |
| public void testFilesEntitlementsWithExclusive() { | ||
| var baseTestPath = Path.of("/base").toAbsolutePath(); | ||
| var testPath1 = Path.of("/base/test").toAbsolutePath(); | ||
| var testPath1String = testPath1.toString(); | ||
|
||
| var testPath2 = Path.of("/base/test/foo").toAbsolutePath(); | ||
| var testPath2String = testPath2.toAbsolutePath(); | ||
| var iae = expectThrows( | ||
| IllegalArgumentException.class, | ||
| () -> new PolicyManager( | ||
|
|
@@ -494,7 +496,9 @@ public void testFilesEntitlementsWithExclusive() { | |
| assertThat( | ||
| iae.getMessage(), | ||
| equalTo( | ||
| "Path [/base/test] is already exclusive to [plugin1][test.module1]," | ||
| "Path [" | ||
| + testPath1String | ||
| + "] is already exclusive to [plugin1][test.module1]," | ||
| + " cannot add exclusive access for [plugin2][test.module2]" | ||
| ) | ||
| ); | ||
|
|
@@ -547,8 +551,8 @@ public void testFilesEntitlementsWithExclusive() { | |
| Strings.format( | ||
| "duplicate/overlapping exclusive paths found in files entitlements: " | ||
| + "[[plugin1] [test] [%s]] and [[(server)] [test] [%s]]", | ||
| testPath1, | ||
| testPath2 | ||
| testPath1String, | ||
| testPath2String | ||
| ), | ||
| iae.getMessage() | ||
| ); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh the fix is this
toAbsolutePath()call?