summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-10-09 22:40:44 +0200
committerClaude Paroz <claude@2xlibre.net>2012-10-09 22:44:43 +0200
commit252cd271e88e1c60fc49c06fac9d45e4c7f8750e (patch)
treebf1d6363184c9387719a10269b4a714ec9532176
parent0a0fe8f71d54e8479e3050ef3bb9d545fd734a65 (diff)
Fixed test failure after IDN domain validation fix
Refs #17867. The address in test_email_regexp_for_performance used to take forever (security issue), then was supposed to fail after the fix (commit 9f8287a3f). Now we are less strict with domain validation, due to new IDN domains, hence the validation of this address pass now.
-rw-r--r--tests/regressiontests/forms/tests/fields.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/regressiontests/forms/tests/fields.py b/tests/regressiontests/forms/tests/fields.py
index 12661d01f5..1027afceb1 100644
--- a/tests/regressiontests/forms/tests/fields.py
+++ b/tests/regressiontests/forms/tests/fields.py
@@ -516,12 +516,8 @@ class FieldsTests(SimpleTestCase):
f = EmailField()
# Check for runaway regex security problem. This will take for-freeking-ever
# if the security fix isn't in place.
- self.assertRaisesMessage(
- ValidationError,
- "'Enter a valid email address.'",
- f.clean,
- 'viewx3dtextx26qx3d@yahoo.comx26latlngx3d15854521645943074058'
- )
+ addr = 'viewx3dtextx26qx3d@yahoo.comx26latlngx3d15854521645943074058'
+ self.assertEqual(addr, f.clean(addr))
def test_emailfield_not_required(self):
f = EmailField(required=False)