Fix conflict for merge PR #726

2014-08-20 11:05:53 -05:00
parent f066e28c35 1c5898d396
commit 9f8cd33d43
4 changed files with 7 additions and 2 deletions
--- a/tests/fields/fields.py
+++ b/tests/fields/fields.py
@@ -2927,6 +2927,9 @@ class FieldTest(unittest.TestCase):
                           "aJIazqqWkm7.net"))
        self.assertTrue(user.validate() is None)

+        user = User(email="new-tld@example.technology")
+        self.assertTrue(user.validate() is None)
+
        user = User(email='me@localhost')
        self.assertRaises(ValidationError, user.validate)