[Python-checkins] r85494 - in python/branches/release27-maint: Lib/test/test_ftplib.py

Thu Oct 14 22:46:25 CEST 2010

Author: antoine.pitrou
Date: Thu Oct 14 22:46:25 2010
New Revision: 85494
Log:
Merged revisions 85492 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r85492 | antoine.pitrou | 2010年10月14日 22:35:26 +0200 (jeu., 14 oct. 2010) | 3 lines
 
 Increase timeouts in test_ftplib (for very slow buildbots)
........
Modified:
 python/branches/release27-maint/ (props changed)
 python/branches/release27-maint/Lib/test/test_ftplib.py
Modified: python/branches/release27-maint/Lib/test/test_ftplib.py
==============================================================================

--- python/branches/release27-maint/Lib/test/test_ftplib.py	(original)
+++ python/branches/release27-maint/Lib/test/test_ftplib.py	Thu Oct 14 22:46:25 2010
@@ -99,7 +99,7 @@
 addr = map(int, arg.split(','))
 ip = '%d.%d.%d.%d' %tuple(addr[:4])
 port = (addr[4] * 256) + addr[5]
- s = socket.create_connection((ip, port), timeout=2)
+ s = socket.create_connection((ip, port), timeout=10)
 self.dtp = self.dtp_handler(s, baseclass=self)
 self.push('200 active data connection established')
 
@@ -107,7 +107,7 @@
 sock = socket.socket()
 sock.bind((self.socket.getsockname()[0], 0))
 sock.listen(5)
- sock.settimeout(2)
+ sock.settimeout(10)
 ip, port = sock.getsockname()[:2]
 ip = ip.replace('.', ',')
 p1, p2 = divmod(port, 256)
@@ -118,7 +118,7 @@
 def cmd_eprt(self, arg):
 af, ip, port = arg.split(arg[0])[1:-1]
 port = int(port)
- s = socket.create_connection((ip, port), timeout=2)
+ s = socket.create_connection((ip, port), timeout=10)
 self.dtp = self.dtp_handler(s, baseclass=self)
 self.push('200 active data connection established')
 
@@ -126,7 +126,7 @@
 sock = socket.socket(socket.AF_INET6)
 sock.bind((self.socket.getsockname()[0], 0))
 sock.listen(5)
- sock.settimeout(2)
+ sock.settimeout(10)
 port = sock.getsockname()[1]
 self.push('229 entering extended passive mode (|||%d|)' %port)
 conn, addr = sock.accept()
@@ -403,7 +403,7 @@
 def setUp(self):
 self.server = DummyFTPServer((HOST, 0))
 self.server.start()
- self.client = ftplib.FTP(timeout=2)
+ self.client = ftplib.FTP(timeout=10)
 self.client.connect(self.server.host, self.server.port)
 
 def tearDown(self):
@@ -545,7 +545,7 @@
 
 def test_makepasv(self):
 host, port = self.client.makepasv()
- conn = socket.create_connection((host, port), 2)
+ conn = socket.create_connection((host, port), 10)
 conn.close()
 # IPv4 is in use, just make sure send_epsv has not been used
 self.assertEqual(self.server.handler.last_received_cmd, 'pasv')
@@ -572,7 +572,7 @@
 
 def test_makepasv(self):
 host, port = self.client.makepasv()
- conn = socket.create_connection((host, port), 2)
+ conn = socket.create_connection((host, port), 10)
 conn.close()
 self.assertEqual(self.server.handler.last_received_cmd, 'epsv')
 
@@ -595,7 +595,7 @@
 def setUp(self):
 self.server = DummyTLS_FTPServer((HOST, 0))
 self.server.start()
- self.client = ftplib.FTP_TLS(timeout=2)
+ self.client = ftplib.FTP_TLS(timeout=10)
 self.client.connect(self.server.host, self.server.port)
 # enable TLS
 self.client.auth()
@@ -608,7 +608,7 @@
 def setUp(self):
 self.server = DummyTLS_FTPServer((HOST, 0))
 self.server.start()
- self.client = ftplib.FTP_TLS(timeout=2)
+ self.client = ftplib.FTP_TLS(timeout=10)
 self.client.connect(self.server.host, self.server.port)
 
 def tearDown(self):
