mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 00:48:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 77727 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r77727 | ezio.melotti | 2010-01-24 18:58:36 +0200 (Sun, 24 Jan 2010) | 1 line

  use assert[Not]IsInstance where appropriate
........
This commit is contained in:
Ezio Melotti 2010-01-24 19:26:24 +00:00
parent f41d29a8eb
commit e96159335f
52 changed files with 287 additions and 288 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Lib/test/test_ftplib.py
View file

@ -592,36 +592,36 @@ class TestTLS_FTPClass(TestCase):
self.server.stop()
def test_control_connection(self):
self.assertFalse(isinstance(self.client.sock, ssl.SSLSocket))
self.assertNotIsInstance(self.client.sock, ssl.SSLSocket)
self.client.auth()
self.assertTrue(isinstance(self.client.sock, ssl.SSLSocket))
self.assertIsInstance(self.client.sock, ssl.SSLSocket)
def test_data_connection(self):
# clear text
sock = self.client.transfercmd('list')
self.assertFalse(isinstance(sock, ssl.SSLSocket))
self.assertNotIsInstance(sock, ssl.SSLSocket)
sock.close()
self.client.voidresp()
# secured, after PROT P
self.client.prot_p()
sock = self.client.transfercmd('list')
self.assertTrue(isinstance(sock, ssl.SSLSocket))
self.assertIsInstance(sock, ssl.SSLSocket)
sock.close()
self.client.voidresp()
# PROT C is issued, the connection must be in cleartext again
self.client.prot_c()
sock = self.client.transfercmd('list')
self.assertFalse(isinstance(sock, ssl.SSLSocket))
self.assertNotIsInstance(sock, ssl.SSLSocket)
sock.close()
self.client.voidresp()
def test_login(self):
# login() is supposed to implicitly secure the control connection
self.assertFalse(isinstance(self.client.sock, ssl.SSLSocket))
self.assertNotIsInstance(self.client.sock, ssl.SSLSocket)
self.client.login()
self.assertTrue(isinstance(self.client.sock, ssl.SSLSocket))
self.assertIsInstance(self.client.sock, ssl.SSLSocket)
# make sure that AUTH TLS doesn't get issued again
self.client.login()