[5.0.x] Refs #35844 -- Expanded compatibility for expected error messages in command tests on Python 3.12.

tainarapalmeira · sarahboyce · commit 5064ddb4f953 · 2024-10-30T11:28:55.000+01:00
Updated CommandTests.test_subparser_invalid_option and CommandDBOptionChoiceTests.test_invalid_choice_db_option to use assertRaisesRegex() for compatibility with modified error messages in Python 3.12, 3.13, and 3.14+.. Backport of fc22fdd from main.
diff --git a/tests/user_commands/tests.py b/tests/user_commands/tests.py
@@ -400,8 +400,8 @@ def test_subparser_dest_required_args(self):
         self.assertIn("bar", out.getvalue())
 
     def test_subparser_invalid_option(self):
-        msg = "invalid choice: 'test' (choose from 'foo')"
-        with self.assertRaisesMessage(CommandError, msg):
+        msg = r"invalid choice: 'test' \(choose from '?foo'?\)"
+        with self.assertRaisesRegex(CommandError, msg):
             management.call_command("subparser", "test", 12)
         msg = "Error: the following arguments are required: subcommand"
         with self.assertRaisesMessage(CommandError, msg):
