[Entitlements] Fix PolicyUtils and PolicyUtilsTests on Windows #126185
+22
−9
Conversation
This file contains 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
ldematte
added
>test
|
Pinging @elastic/es-core-infra (Team:Core/Infra) |
…tte/elasticsearch into entitlements/fix-policy-utils-test
ldematte
changed the title
prdoyle
approved these changes
Apr 3, 2025
| @@ -160,7 +163,7 @@ public FileData withPlatform(Platform platform) { | |||
|
|
|||
| @Override | |||
| public String description() { | |||
| return Strings.format("[%s] <%s>/%s%s", mode, baseDir, relativePath, exclusive ? " (exclusive)" : ""); | |||
| return Strings.format("[%s] <%s>%s%s%s", mode, baseDir, SEPARATOR, relativePath, exclusive ? " (exclusive)" : ""); | |||
There was a problem hiding this comment.
What's the significance of this?
There was a problem hiding this comment.
To have separators consistent in the output; on Windows that was looking weird, like <DATA>/c\d
This is more cosmetic, but since I fixed the assertion I wanted it to be consistent too.
There was a problem hiding this comment.
I could have asserted that on Windows the "correct" output was <DATA>/c\d, but I wanted to have it like <DATA>\c\d
ldematte
added a commit
to ldematte/elasticsearch
that referenced
this pull request
Apr 3, 2025
…ic#126185) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes elastic#126176
This was referenced Apr 3, 2025
ldematte
added a commit
to ldematte/elasticsearch
that referenced
this pull request
Apr 3, 2025
…ic#126185) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes elastic#126176
ldematte
added a commit
to ldematte/elasticsearch
that referenced
this pull request
Apr 3, 2025
…ic#126185) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes elastic#126176
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 3, 2025
…) (#126234) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes #126176
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 3, 2025
…) (#126236) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes #126176
elasticsearchmachine
pushed a commit
that referenced
this pull request
Apr 3, 2025
…) (#126235) This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows: - in tests, absolute paths like always are different, this fix updates the tests to account for the difference. - on Windows, Files.move was failing because we were parsing the Entitlement policy but not closing the stream in a timely manner. This causes plugin installation (and related CI tests) to fail 70% of the time. Fixed by closing the stream properly Fixes #126176
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes 2 issues discovered around PolicyUtils (and PolicyUtilsTests) when running CI on Windows:
Fixes #126176