From: Victor Stinner <victor.stinner@gmail.com>
Date: Tue, 7 Apr 2015 10:59:14 +0000 (+0200)
Subject: ssue #23881: ftp://gatekeeper.research.compaq.com/ and ftp://ftp.debian.org/
X-Git-Tag: v2.7.10rc1~63
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9a46eb7cdbe574b0ea43f7d0124ac6d8d465174f;p=thirdparty%2FPython%2Fcpython.git

ssue #23881: ftp://gatekeeper.research.compaq.com/ and ftp://ftp.debian.org/
are down, don't use anymore in test_urllib2net

ftp.kernel.org is also slow or down, so reuse the same FTP servers than Python
3.4 and 3.5: use ftp.debian.org instead.
---

diff --git a/Lib/test/test_urllib2net.py b/Lib/test/test_urllib2net.py
index 818bf53bc887..8eec3ad09204 100644
--- a/Lib/test/test_urllib2net.py
+++ b/Lib/test/test_urllib2net.py
@@ -102,11 +102,9 @@ class OtherNetworkTests(unittest.TestCase):
 
     def test_ftp(self):
         urls = [
-            'ftp://ftp.kernel.org/pub/linux/kernel/README',
-            'ftp://ftp.kernel.org/pub/linux/kernel/non-existent-file',
-            #'ftp://ftp.kernel.org/pub/leenox/kernel/test',
-            'ftp://gatekeeper.research.compaq.com/pub/DEC/SRC'
-                '/research-reports/00README-Legal-Rules-Regs',
+            'ftp://ftp.debian.org/debian/README',
+            ('ftp://ftp.debian.org/debian/non-existent-file',
+             None, urllib2.URLError),
             ]
         self._test_urls(urls, self._extra_handlers())
 
@@ -284,7 +282,7 @@ class TimeoutTest(unittest.TestCase):
             u = _urlopen_with_retry(url, timeout=120)
             self.assertEqual(u.fp._sock.fp._sock.gettimeout(), 120)
 
-    FTP_HOST = "ftp://ftp.mirror.nl/pub/gnu/"
+    FTP_HOST = 'ftp://ftp.debian.org/debian/'
 
     def test_ftp_basic(self):
         self.assertIsNone(socket.getdefaulttimeout())