aboutsummaryrefslogtreecommitdiffstats
path: root/community/apparmor/python-3.10-test-aa-notify.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/apparmor/python-3.10-test-aa-notify.patch')
-rw-r--r--community/apparmor/python-3.10-test-aa-notify.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/community/apparmor/python-3.10-test-aa-notify.patch b/community/apparmor/python-3.10-test-aa-notify.patch
deleted file mode 100644
index e3ecc4a1f89..00000000000
--- a/community/apparmor/python-3.10-test-aa-notify.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Patch-Source: https://gitlab.com/apparmor/apparmor/-/merge_requests/848
-From 39f4132ab95abfa88c2c688048493fae2443f7e0 Mon Sep 17 00:00:00 2001
-From: Christian Boltz <apparmor@cboltz.de>
-Date: Mon, 14 Feb 2022 19:59:21 +0100
-Subject: [PATCH] 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
----
- 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 76cf597aa..aa41f32f7 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
-