summaryrefslogtreecommitdiffstats
path: root/Lib/test
diff options
context:
space:
mode:
authorGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:11:06 (GMT)
committerGiampaolo Rodola' <g.rodola@gmail.com>2011-05-07 17:11:06 (GMT)
commitffc235cbbf66b3859af1a88d52d52349c6592130 (patch)
treeb8ada4219a221b5714d94b52e01a0500d826a07f /Lib/test
parent8b7664d0b81b65acf1e1946adf22d72cfa2dff26 (diff)
parent24befa87dcddd95005c82a1c42553856de7dcd08 (diff)
downloadcpython-ffc235cbbf66b3859af1a88d52d52349c6592130.zip
cpython-ffc235cbbf66b3859af1a88d52d52349c6592130.tar.gz
cpython-ffc235cbbf66b3859af1a88d52d52349c6592130.tar.bz2
merge with 3.2
Diffstat (limited to 'Lib/test')
-rw-r--r--Lib/test/test_ftplib.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py
index 92479d9..78e0fb4 100644
--- a/Lib/test/test_ftplib.py
+++ b/Lib/test/test_ftplib.py
@@ -81,6 +81,8 @@ class DummyFTPHandler(asynchat.async_chat):
def __init__(self, conn):
asynchat.async_chat.__init__(self, conn)
+ # tells the socket to handle urgent data inline (ABOR command)
+ self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_OOBINLINE, 1)
self.set_terminator(b"\r\n")
self.in_buffer = []
self.dtp = None
@@ -202,6 +204,9 @@ class DummyFTPHandler(asynchat.async_chat):
self.push('221 quit ok')
self.close()
+ def cmd_abor(self, arg):
+ self.push('226 abor ok')
+
def cmd_stor(self, arg):
self.push('125 stor ok')
@@ -520,6 +525,9 @@ class TestFTPClass(TestCase):
# Ensure the connection gets closed; sock attribute should be None
self.assertEqual(self.client.sock, None)
+ def test_abort(self):
+ self.client.abort()
+
def test_retrbinary(self):
def callback(data):
received.append(data.decode('ascii'))