From 81a588ba07dd43af42deb4f397a25adac9bcf25b Mon Sep 17 00:00:00 2001 From: liris Date: Thu, 10 Apr 2014 09:49:50 +0900 Subject: [PATCH] - fix to close socket --- tests/test_websocket.py | 9 +++++---- websocket/__init__.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/test_websocket.py b/tests/test_websocket.py index 9cad94c..ce29455 100644 --- a/tests/test_websocket.py +++ b/tests/test_websocket.py @@ -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): diff --git a/websocket/__init__.py b/websocket/__init__.py index 3e12cbf..1a12f1e 100644 --- a/websocket/__init__.py +++ b/websocket/__init__.py @@ -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()