Close socket when connect err

tests/test_socket.py

@@ -87,6 +87,23 @@ def test_client_socket_timeout():
     server_socket.close()
 
 
+def test_client_socket_open():
+    client_socket = TSocket(host="localhost", port=12345)
+    with pytest.raises(TTransportException) as e:
+        client_socket.open()
+    assert e.value.message == "Could not connect to ('localhost', 12345)"
+    assert not client_socket.is_open()
+
+    server_socket = TServerSocket(host="localhost", port=12345)
+    server_socket.listen()
+
+    client_socket.open()
+    assert client_socket.is_open()
+
+    server_socket.close()
+    client_socket.close()
+
+
 def test_client_socket_close():
     server_socket = TServerSocket(host="localhost", port=12345)
     server_socket.listen()

thriftpy2/transport/socket.py

@@ -99,6 +99,7 @@ def open(self):
                 self.sock.settimeout(self.socket_timeout)
 
         except (socket.error, OSError):
+            self.close()
             raise TTransportException(
                 type=TTransportException.NOT_OPEN,
                 message="Could not connect to %s" % str(addr))
@@ -144,9 +145,9 @@ def close(self):
         try:
             self.sock.shutdown(socket.SHUT_RDWR)
             self.sock.close()
-            self.sock = None
         except (socket.error, OSError):
             pass
+        self.sock = None
 
 
 class TServerSocket(object):