Christian Boltz
af1eec118e
- Add python310-help-mr848.patch so that Tumbleweed can switch python3 to Python 3.10 (https://gitlab.com/apparmor/apparmor/-/merge_requests/848) OBS-URL: https://build.opensuse.org/request/show/975634 OBS-URL: https://build.opensuse.org/package/show/security:apparmor/apparmor?expand=0&rev=332
58 lines
2.2 KiB
Diff
58 lines
2.2 KiB
Diff
From 8a21472175501823303a8af270bd38a60ff4ac9c Mon Sep 17 00:00:00 2001
|
|
From: John Johansen <john@jjmx.net>
|
|
Date: Tue, 15 Feb 2022 19:17:30 +0000
|
|
Subject: [PATCH] Merge make test-aa-notify test_help_contents () less strict
|
|
|
|
Python 3.10 generates a slightly different --help output.
|
|
|
|
Fixes https://gitlab.com/apparmor/apparmor/-/issues/220
|
|
|
|
Closes #220
|
|
MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/848
|
|
Acked-by: Approved-by: John Johansen <john@jjmx.net>
|
|
Merged-by: John Johansen <john@jjmx.net>
|
|
|
|
(cherry picked from commit ba14227bb51a76b416a8da46c241a8d07506badc)
|
|
Signed-off-by: John Johansen <john.johansen@canonical.com>
|
|
---
|
|
utils/test/test-aa-notify.py | 11 +++++++----
|
|
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/utils/test/test-aa-notify.py b/utils/test/test-aa-notify.py
|
|
index 2484c7f97..cfb5fa5a8 100644
|
|
--- a/utils/test/test-aa-notify.py
|
|
+++ b/utils/test/test-aa-notify.py
|
|
@@ -148,13 +148,15 @@ Feb 4 13:40:38 XPS-13-9370 kernel: [128552.880347] audit: type=1400 audit({epoc
|
|
'''Test output of help text'''
|
|
|
|
expected_return_code = 0
|
|
- expected_output_is = \
|
|
+ expected_output_1 = \
|
|
'''usage: aa-notify [-h] [-p] [--display DISPLAY] [-f FILE] [-l] [-s NUM] [-v]
|
|
[-u USER] [-w NUM] [--debug]
|
|
|
|
Display AppArmor notifications or messages for DENIED entries.
|
|
+'''
|
|
|
|
-optional arguments:
|
|
+ expected_output_2 = \
|
|
+'''
|
|
-h, --help show this help message and exit
|
|
-p, --poll poll AppArmor logs and display notifications
|
|
--display DISPLAY set the DISPLAY environment variable (might be needed if
|
|
@@ -174,8 +176,9 @@ optional arguments:
|
|
return_code, output = cmd([aanotify_bin, '--help'])
|
|
result = 'Got return code %d, expected %d\n' % (return_code, expected_return_code)
|
|
self.assertEqual(expected_return_code, return_code, result + output)
|
|
- result = 'Got output "%s", expected "%s"\n' % (output, expected_output_is)
|
|
- self.assertEqual(expected_output_is, output, result + output)
|
|
+
|
|
+ self.assertIn(expected_output_1, output)
|
|
+ self.assertIn(expected_output_2, output)
|
|
|
|
def test_entries_since_100_days(self):
|
|
'''Test showing log entries since 100 days'''
|
|
--
|
|
GitLab
|
|
|