Merge utils: adjusts aa-notify tests to handle Python 3.13+

jrjohansen · jrjohansen · commit 5f8c2c5fc9ff · 2025-02-11T15:14:05.000-08:00
Python 3.13 changes the formatting of long-short option pairs that use a meta-variable. Up until 3.13 the meta-variable was repeated. Since Python change [1] the meta-var is only printed once. [1] python/cpython#103372 Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@canonical.com> MR: https://gitlab.com/apparmor/apparmor/-/merge_requests/1495 Approved-by: Georgia Garcia <georgia.garcia@canonical.com> Approved-by: Christian Boltz <apparmor@cboltz.de> Merged-by: Zygmunt Krynicki <me@zygoon.pl> (cherry picked from commit 219626c)
diff --git a/utils/test/test-aa-notify.py b/utils/test/test-aa-notify.py
@@ -209,14 +209,13 @@ def test_help_contents(self):
   -p, --poll            poll AppArmor logs and display notifications
   --display DISPLAY     set the DISPLAY environment variable (might be needed if
                         sudo resets $DISPLAY)
-  -f FILE, --file FILE  search FILE for AppArmor messages
+  -f, --file FILE       search FILE for AppArmor messages
   -l, --since-last      display stats since last login
-  -s NUM, --since-days NUM
-                        show stats for last NUM days (can be used alone or with
+  -s, --since-days NUM  show stats for last NUM days (can be used alone or with
                         -p)
   -v, --verbose         show messages with stats
-  -u USER, --user USER  user to drop privileges to when not using sudo
-  -w NUM, --wait NUM    wait NUM seconds before displaying notifications (with
+  -u, --user USER       user to drop privileges to when not using sudo
+  -w, --wait NUM        wait NUM seconds before displaying notifications (with
                         -p)
   --prompt-filter PF    kind of operations which display a popup prompt
   --debug               debug mode
@@ -238,6 +237,28 @@ def test_help_contents(self):
                         regular expression to match the network socket type
 '''  # noqa: E128
 
+        if sys.version_info[:2] < (3, 13):
+            # Python 3.13 tweaked argparse output [1]. When running on older
+            # Python versions, we adapt the expected output to match.
+            #
+            # https://github.com/python/cpython/pull/103372
+            patches = [(
+                ', --file FILE     ',
+                ' FILE, --file FILE',
+            ), (
+                ', --since-days NUM  show stats for last NUM days (can be used alone or with',
+                ' NUM, --since-days NUM\n'
+                + '                        show stats for last NUM days (can be used alone or with',
+            ), (
+                ', --user USER     ',
+                ' USER, --user USER',
+            ), (
+                ', --wait NUM    ',
+                ' NUM, --wait NUM',
+            )]
+            for patch in patches:
+                expected_output_2 = expected_output_2.replace(patch[0], patch[1])
+
         return_code, output = cmd(aanotify_bin + ['--help'])
         result = 'Got return code {}, expected {}\n'.format(return_code, expected_return_code)
         self.assertEqual(expected_return_code, return_code, result + output)
