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

[lamby at users.alioth.debian.org]

    Date: Thursday, March 24, 2011 @ 15:23:39
  Author: lamby
Revision: 16213

Merge patch from Krzysztof Klimonda to disable more network access tests. (Closes: #598674)

Modified:
  packages/python-django/trunk/debian/changelog
  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/changelog	2011-03-24 15:23:27 UTC (rev 16212)
+++ packages/python-django/trunk/debian/changelog	2011-03-24 15:23:39 UTC (rev 16213)
@@ -3,6 +3,8 @@
   * New upstream release.
     - Update 01_disable_url_verify_regression_tests.diff.
     - Update 07_disable_url_verify_model_tests.diff.
+    - Merge patch from Krzysztof Klimonda to disable more network access tests.
+      (Closes: #598674)
 
  -- Chris Lamb <lamby at debian.org>  Thu, 24 Mar 2011 11:33:23 +0000
 

Modified: 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	2011-03-24 15:23:27 UTC (rev 16212)
+++ packages/python-django/trunk/debian/patches/01_disable_url_verify_regression_tests.diff	2011-03-24 15:23:39 UTC (rev 16213)
@@ -35,3 +35,43 @@
      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')
+@@ -625,18 +604,6 @@
+         except ValidationError, e:
+             self.assertEqual("[u'This URL appears to be a broken link.']", str(e))
+ 
+-    def test_urlfield_10(self):
+-        # UTF-8 char in path, enclosed by a monkey-patch to make sure
+-        # the encoding is passed to urllib2.urlopen
+-        f = URLField(verify_exists=True)
+-        try:
+-            _orig_urlopen = urllib2.urlopen
+-            urllib2.urlopen = lambda req: True
+-            url = u'http://t\xfcr.djangoproject.com/'
+-            self.assertEqual(url, f.clean(url))
+-        finally:
+-            urllib2.urlopen = _orig_urlopen
+-
+     # BooleanField ################################################################
+ 
+     def test_booleanfield_1(self):
+
+--- a/tests/regressiontests/forms/tests/error_messages.py
++++ b/tests/regressiontests/forms/tests/error_messages.py
+@@ -139,17 +139,6 @@
+         self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', None))
+         self.assertFormErrors([u'EMPTY FILE'], f.clean, SimpleUploadedFile('name', ''))
+ 
+-    def test_urlfield(self):
+-        e = {
+-            'required': 'REQUIRED',
+-            'invalid': 'INVALID',
+-            'invalid_link': 'INVALID LINK',
+-        }
+-        f = URLField(verify_exists=True, error_messages=e)
+-        self.assertFormErrors([u'REQUIRED'], f.clean, '')
+-        self.assertFormErrors([u'INVALID'], f.clean, 'abc.c')
+-        self.assertFormErrors([u'INVALID LINK'], f.clean, 'http://www.broken.djangoproject.com')
+-
+     def test_booleanfield(self):
+         e = {
+             'required': 'REQUIRED',