- fix to close socket

This commit is contained in:
liris
2014-04-10 09:49:50 +09:00
parent bda0b9874a
commit 81a588ba07
2 changed files with 6 additions and 5 deletions

View File

@@ -344,12 +344,13 @@ class WebSocketTest(unittest.TestCase):
s.pong("Hi")
s.close()
@unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
def testSecureWebSocket(self):
try:
if 1:
import ssl
s = ws.create_connection("wss://echo.websocket.org/")
self.assertNotEquals(s, None)
self.assert_(isinstance(s.sock, ssl.SSLSock))
self.assert_(isinstance(s.sock, ssl.SSLSocket))
s.send("Hello, World")
result = s.recv()
self.assertEquals(result, "Hello, World")
@@ -357,8 +358,8 @@ class WebSocketTest(unittest.TestCase):
result = s.recv()
self.assertEquals(result, "こにゃにゃちは、世界")
s.close()
except:
pass
#except:
# pass
@unittest.skipUnless(TEST_WITH_INTERNET, "Internet-requiring tests are disabled")
def testWebSocketWihtCustomHeader(self):

View File

@@ -790,7 +790,7 @@ class WebSocket(object):
self.sock.shutdown(socket.SHUT_RDWR)
except:
pass
self._closeInternal()
self._closeInternal()
def _closeInternal(self):
self.sock.close()