interfaces/builtin, testutil: skip unit test when apparmor_parser is not in PATH #14951
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
…not in PATH On some distros which support AppArmor, the apparmor_parser binary is located under /usr/sbin, which also happens to not be included in a regular user's $PATH. The sandbox/apparmor package code is able to locate it directly by checking a number of default paths, however the test code simply assumes that it is available in $PATH. Instead of complicating things further, let's skip the offending unit test. Signed-off-by: Maciej Borzecki <[email protected]>
zyga
approved these changes
Jan 20, 2025
| @@ -868,6 +871,9 @@ ptrace (read, trace) peer=unconfined, | |||
|
|
|||
| // Profile existing profile | |||
| expectedHash, err := testutil.AppArmorParseAndHashHelper("#include <tunables/global> \nprofile docker_support {" + privilegedProfile + "}") | |||
| if err != nil && errors.Is(err, exec.ErrNotFound) { | |||
There was a problem hiding this comment.
The left hand side is redundant
bboozzoo
force-pushed
the
bboozzoo/apparmor_parser-in-path
branch
from
e36856a to
6baee6c
Compare
bboozzoo
changed the title
|
Tue Jan 21 14:11:44 UTC 2025 Failures:Preparing:
Executing:
Restoring:
|
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #14951 +/- ##
=========================================
Coverage ? 78.26%
=========================================
Files ? 1157
Lines ? 153473
Branches ? 0
=========================================
Hits ? 120119
Misses ? 25947
Partials ? 7407
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
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.
On some distros which support AppArmor, the apparmor_parser binary is located under /usr/sbin, which also happens to not be included in a regular user's $PATH. The sandbox/apparmor package code is able to locate it directly by checking a number of default paths, however the test code simply assumes that it is available in $PATH. Instead of complicating things further, let's skip the offending unit test.
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?