[Python-modules-commits] r15222 - in packages/python-django/trunk/debian (3 files)

[hertzog at users.alioth.debian.org]

    Date: Friday, December 31, 2010 @ 14:05:38
  Author: hertzog
Revision: 15222

Update 01_disable_url_verify_regression_tests.diff to cope with the
updated regressions tests.

Added:
  packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
Modified:
  packages/python-django/trunk/debian/changelog
  packages/python-django/trunk/debian/patches/series

Modified: packages/python-django/trunk/debian/changelog
===================================================================
--- packages/python-django/trunk/debian/changelog	2010-12-31 13:47:36 UTC (rev 15221)
+++ packages/python-django/trunk/debian/changelog	2010-12-31 14:05:38 UTC (rev 15222)
@@ -5,8 +5,8 @@
   * Drop patches merged upstream:
     - debian/patches/05_fix_regression_tests.diff
     - debian/patches/06_fix_regression_tests.diff
-  * Drop debian/patches/01_disable_url_verify_regression_tests.diff as it's no
-    longer needed (the failing test has been removed upstream).
+  * Update 01_disable_url_verify_regression_tests.diff to cope with the
+    updated regressions tests.
   * Update 03_manpage.diff and 04_hyphen-manpage.diff to cope with changes in
     the manual page.
 

Added: packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff
===================================================================
--- packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff	                        (rev 0)
+++ packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff	2010-12-31 14:05:38 UTC (rev 15222)
@@ -0,0 +1,43 @@
+Forwarded-Upstream: not needed
+Author: Chris Lamb <lamby at debian.org>
+Comment:
+ Disable regression tests that require an internet connection.
+ .
+ This is a Debian specific patch.
+
+--- a/tests/regressiontests/forms/tests/fields.py
++++ b/tests/regressiontests/forms/tests/fields.py
+@@ -515,33 +515,6 @@ class FieldsTests(TestCase):
+         self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example.')
+         self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://.com')
+ 
+-    def test_urlfield_3(self):
+-        f = URLField(verify_exists=True)
+-        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
+-        self.assertRaisesErrorWithMessage(ValidationError, "[u'Enter a valid URL.']", f.clean, 'http://example')
+-        self.assertRaises(ValidationError, f.clean, 'http://www.broken.djangoproject.com') # bad domain
+-        try:
+-            f.clean('http://www.broken.djangoproject.com') # bad domain
+-        except ValidationError, e:
+-            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+-        self.assertRaises(ValidationError, f.clean, 'http://google.com/we-love-microsoft.html') # good domain, bad page
+-        try:
+-            f.clean('http://google.com/we-love-microsoft.html') # good domain, bad page
+-        except ValidationError, e:
+-            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+-        # Valid and existent IDN
+-        self.assertEqual(u'http://\u05e2\u05d1\u05e8\u05d9\u05ea.idn.icann.org/', f.clean(u'http://עברית.idn.icann.org/'))
+-        # Valid but non-existent IDN
+-        try:
+-            f.clean(u'http://broken.עברית.idn.icann.org/')
+-        except ValidationError, e:
+-            self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+-
+-    def test_urlfield_4(self):
+-        f = URLField(verify_exists=True, required=False)
+-        self.assertEqual(u'', f.clean(''))
+-        self.assertEqual(u'http://www.google.com/', f.clean('http://www.google.com')) # This will fail if there's no Internet connection
+-
+     def test_urlfield_5(self):
+         f = URLField(min_length=15, max_length=20)
+         self.assertRaisesErrorWithMessage(ValidationError, "[u'Ensure this value has at least 15 characters (it has 13).']", f.clean, 'http://f.com')

Modified: packages/python-django/trunk/debian/patches/series
===================================================================
--- packages/python-django/trunk/debian/patches/series	2010-12-31 13:47:36 UTC (rev 15221)
+++ packages/python-django/trunk/debian/patches/series	2010-12-31 14:05:38 UTC (rev 15222)
@@ -1,3 +1,4 @@
+01_disable_url_verify_regression_tests.diff
 03_manpage.diff
 04_hyphen-manpage.diff
 07_disable_url_verify_model_tests.diff