From baf705f34a8c8977d042ce43c71f508f9ca4f8ce Mon Sep 17 00:00:00 2001 From: Nick Pope Date: Tue, 21 Nov 2023 15:11:58 +0000 Subject: Refs #34986 -- Fixed some test assertions for PyPy. These failures were due to minor inconsistencies or implementation differences between CPython and PyPy. --- tests/forms_tests/field_tests/test_emailfield.py | 2 +- tests/forms_tests/field_tests/test_urlfield.py | 2 +- tests/forms_tests/widget_tests/test_selectdatewidget.py | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'tests/forms_tests') diff --git a/tests/forms_tests/field_tests/test_emailfield.py b/tests/forms_tests/field_tests/test_emailfield.py index 079267ca8b..601318bae3 100644 --- a/tests/forms_tests/field_tests/test_emailfield.py +++ b/tests/forms_tests/field_tests/test_emailfield.py @@ -71,6 +71,6 @@ class EmailFieldTest(FormFieldAssertionsMixin, SimpleTestCase): self.assertIsNone(f.clean(None)) def test_emailfield_unable_to_set_strip_kwarg(self): - msg = "__init__() got multiple values for keyword argument 'strip'" + msg = "got multiple values for keyword argument 'strip'" with self.assertRaisesMessage(TypeError, msg): EmailField(strip=False) diff --git a/tests/forms_tests/field_tests/test_urlfield.py b/tests/forms_tests/field_tests/test_urlfield.py index 058a2992ed..2cd1a82694 100644 --- a/tests/forms_tests/field_tests/test_urlfield.py +++ b/tests/forms_tests/field_tests/test_urlfield.py @@ -136,7 +136,7 @@ class URLFieldTest(FormFieldAssertionsMixin, SimpleTestCase): self.assertIsNone(f.clean(None)) def test_urlfield_unable_to_set_strip_kwarg(self): - msg = "__init__() got multiple values for keyword argument 'strip'" + msg = "got multiple values for keyword argument 'strip'" with self.assertRaisesMessage(TypeError, msg): URLField(strip=False) diff --git a/tests/forms_tests/widget_tests/test_selectdatewidget.py b/tests/forms_tests/widget_tests/test_selectdatewidget.py index 215c41a809..017e90f5f6 100644 --- a/tests/forms_tests/widget_tests/test_selectdatewidget.py +++ b/tests/forms_tests/widget_tests/test_selectdatewidget.py @@ -5,6 +5,7 @@ from django.forms import DateField, Form, SelectDateWidget from django.test import override_settings from django.utils import translation from django.utils.dates import MONTHS_AP +from django.utils.version import PYPY from .base import WidgetTest @@ -611,7 +612,11 @@ class SelectDateWidgetTest(WidgetTest): ((None, "12", "1"), None), (("2000", None, "1"), None), (("2000", "12", None), None), - ((str(sys.maxsize + 1), "12", "1"), "0-0-0"), + ( + (str(sys.maxsize + 1), "12", "1"), + # PyPy does not raise OverflowError. + f"{sys.maxsize + 1}-12-1" if PYPY else "0-0-0", + ), ] for values, expected in tests: with self.subTest(values=values): -- cgit v1.3