diff options
Diffstat (limited to 'tests/admin_scripts/tests.py')
| -rw-r--r-- | tests/admin_scripts/tests.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/admin_scripts/tests.py b/tests/admin_scripts/tests.py index fefe4f50bb..6fdd873661 100644 --- a/tests/admin_scripts/tests.py +++ b/tests/admin_scripts/tests.py @@ -34,7 +34,7 @@ from django.db.migrations.recorder import MigrationRecorder from django.test import LiveServerTestCase, SimpleTestCase, TestCase, override_settings from django.test.utils import captured_stderr, captured_stdout from django.urls import path -from django.utils.version import PY313, PY314, get_docs_version +from django.utils.version import PY313, get_docs_version from django.views.static import serve from . import urls @@ -2355,16 +2355,10 @@ class Discovery(SimpleTestCase): class CommandDBOptionChoiceTests(SimpleTestCase): def test_invalid_choice_db_option(self): - if PY314: - expected_error = ( - "Error: argument --database: invalid choice: 'deflaut' " - "(choose from default, other)" - ) - else: - expected_error = ( - "Error: argument --database: invalid choice: 'deflaut' " - "(choose from 'default', 'other')" - ) + expected_error = ( + r"Error: argument --database: invalid choice: 'deflaut' " + r"\(choose from '?default'?, '?other'?\)" + ) args = [ "changepassword", "createsuperuser", @@ -2384,7 +2378,7 @@ class CommandDBOptionChoiceTests(SimpleTestCase): ] for arg in args: - with self.assertRaisesMessage(CommandError, expected_error): + with self.assertRaisesRegex(CommandError, expected_error): call_command(arg, "--database", "deflaut", verbosity=0) |