summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-09-28 20:57:21 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-09-28 20:57:21 (GMT)
commite14267bbad5cfc96712025a7f14d1c259c975aa8 (patch)
treedb5528335c39172a7316577df703e7460d77cc85 /Lib/test
parent7ff19fa2932a15ba62390a2e9930f71e48dfad80 (diff)
downloadcpython-e14267bbad5cfc96712025a7f14d1c259c975aa8.zip
cpython-e14267bbad5cfc96712025a7f14d1c259c975aa8.tar.gz
cpython-e14267bbad5cfc96712025a7f14d1c259c975aa8.tar.bz2
merge in the fix for test_ftplib on some bots [reviewed by Georg]
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_ftplib.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 7e8dce6..c48497d 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -212,6 +212,11 @@ class DummyFTPServer(asyncore.dispatcher, threading.Thread):
def handle_accept(self):
conn, addr = self.accept()
self.handler = self.handler(conn)
+ self.close()
+
+ def handle_connect(self):
+ self.close()
+ handle_read = handle_connect
def writable(self):
return 0