mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix failure in test_poplib after issue #20951.

This commit is contained in:
Antoine Pitrou 2014-04-29 10:27:09 +02:00
parent b8503896ad
commit 3f73e4c715
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Lib/test/test_poplib.py
View File

@ -349,23 +349,18 @@ def test_stls_context(self):
if SUPPORTS_SSL: if SUPPORTS_SSL:
from test.test_ftplib import SSLConnection
class DummyPOP3_SSLHandler(DummyPOP3Handler): class DummyPOP3_SSLHandler(SSLConnection, DummyPOP3Handler):
def __init__(self, conn): def __init__(self, conn):
asynchat.async_chat.__init__(self, conn) asynchat.async_chat.__init__(self, conn)
ssl_socket = ssl.wrap_socket(self.socket, certfile=CERTFILE, self.secure_connection()
server_side=True,
do_handshake_on_connect=False)
self.del_channel()
self.set_socket(ssl_socket)
# Must try handshake before calling push()
self.tls_active = True
self.tls_starting = True
self._do_tls_handshake()
self.set_terminator(b"\r\n") self.set_terminator(b"\r\n")
self.in_buffer = [] self.in_buffer = []
self.push('+OK dummy pop3 server ready. <timestamp>') self.push('+OK dummy pop3 server ready. <timestamp>')
self.tls_active = True
self.tls_starting = False
@requires_ssl @requires_ssl