[7.15](backport #27178) libbeat/cmd/instance: ensure test config file has appropriate permissions#27797
Merged
[7.15](backport #27178) libbeat/cmd/instance: ensure test config file has appropriate permissions#27797
Conversation
…ions (#27178) Git does not store r/w permissions, instead depending on the host system's umask. On some systems the default umask is 0o002, meaning that the test config file is checked out with g+w permission, causing the test to fail. This change ensures that the test config is owner-exclusive write before running the test. It also adds checks to currently ineffective error assignments. (cherry picked from commit 627b7a8) # Conflicts: # libbeat/cmd/instance/beat_test.go
|
This pull request doesn't have a |
Contributor
💚 Build Succeeded
Expand to view the summary
Build stats
Test stats 🧪
Trends 🧪💚 Flaky test reportTests succeeded. Expand to view the summary
Test stats 🧪
|
Contributor
|
/test |
1 similar comment
Member
|
/test |
P1llus
reviewed
Sep 9, 2021
libbeat/cmd/instance/beat_test.go
Outdated
| <<<<<<< HEAD | ||
| ======= | ||
| assert.NoError(t, err) | ||
| api_key, err := kibanaConfig.String("api_key", -1) |
Member
There was a problem hiding this comment.
Did you mean to remove the actual tests as well?
Contributor
There was a problem hiding this comment.
Yes, this test was added recently and does not exist in 7.15. This was the cause of the merge conflict as can be seen in the files changed overview.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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 is an automatic backport of pull request #27178 done by Mergify.
Cherry-pick of 627b7a8 has failed:
To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally
Mergify commands and options
More conditions and actions can be found in the documentation.
You can also trigger Mergify actions by commenting on this pull request:
@Mergifyio refreshwill re-evaluate the rules@Mergifyio rebasewill rebase this PR on its base branch@Mergifyio updatewill merge the base branch into this PR@Mergifyio backport <destination>will backport this PR on<destination>branchAdditionally, on Mergify dashboard you can:
Finally, you can contact us on https://mergify.io/