|
@@ -15,7 +15,7 @@
|
|
|
|
|
|
|
|
|
import unittest
|
|
|
-import socket
|
|
|
+import ssl, socket
|
|
|
import tempfile
|
|
|
import time
|
|
|
import stat
|
|
@@ -729,16 +729,15 @@ class TestSecureHTTPServer(unittest.TestCase):
|
|
|
def test_wrap_sock_in_ssl_context(self):
|
|
|
sock = socket.socket()
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- self.assertRaises(socket.error,
|
|
|
+
|
|
|
+
|
|
|
+ self.assertRaises(CmdctlException,
|
|
|
self.server._wrap_socket_in_ssl_context,
|
|
|
sock,
|
|
|
'no_such_file', 'no_such_file')
|
|
|
|
|
|
-
|
|
|
-
|
|
|
- self.assertRaises(socket.error,
|
|
|
+
|
|
|
+ self.assertRaises(ssl.SSLError,
|
|
|
self.server._wrap_socket_in_ssl_context,
|
|
|
sock,
|
|
|
BUILD_FILE_PATH + 'cmdctl.py',
|