Merge pull request #166 from Gromil/master

Added destructor to close requests.Session

keycloak/connection.py

@@ -60,6 +60,9 @@ class ConnectionManager(object):
 
             self._s.mount(protocol, adapter)
 
+    def __del__(self):
+        self._s.close()
+
     @property
     def base_url(self):
         """ Return base url in use for requests to the server. """

keycloak/tests/test_connection.py

@@ -156,34 +156,36 @@ class TestConnection(unittest.TestCase):
         with mock.patch.object(KeycloakOpenID, "__init__", return_value=None) as mock_keycloak_open_id:
             with mock.patch("keycloak.keycloak_openid.KeycloakOpenID.token", return_value=fake_token):
                 with mock.patch("keycloak.connection.ConnectionManager.__init__", return_value=None) as mock_connection_manager:
-                    server_url = "https://localhost/auth/"
-                    username = "admin"
-                    password = "secret"
-                    realm_name = "master"
-
-                    headers = {
-                        'Custom': 'test-custom-header'
-                    }
-                    KeycloakAdmin(server_url=server_url,
-                                  username=username,
-                                  password=password,
-                                  realm_name=realm_name,
-                                  verify=False,
-                                  custom_headers=headers)
-
-                    mock_keycloak_open_id.assert_called_with(server_url=server_url,
-                                                             realm_name=realm_name,
-                                                             client_id='admin-cli',
-                                                             client_secret_key=None,
-                                                             verify=False,
-                                                             custom_headers=headers)
-
-                    expected_header = {'Authorization': 'Bearer faketoken',
-                                       'Content-Type': 'application/json',
-                                       'Custom': 'test-custom-header'
-                                       }
-
-                    mock_connection_manager.assert_called_with(base_url=server_url,
-                                                               headers=expected_header,
-                                                               timeout=60,
-                                                               verify=False)
+                    with mock.patch("keycloak.connection.ConnectionManager.__del__", return_value=None) as mock_connection_manager_delete:
+                        server_url = "https://localhost/auth/"
+                        username = "admin"
+                        password = "secret"
+                        realm_name = "master"
+
+                        headers = {
+                            'Custom': 'test-custom-header'
+                        }
+                        KeycloakAdmin(server_url=server_url,
+                                      username=username,
+                                      password=password,
+                                      realm_name=realm_name,
+                                      verify=False,
+                                      custom_headers=headers)
+
+                        mock_keycloak_open_id.assert_called_with(server_url=server_url,
+                                                                 realm_name=realm_name,
+                                                                 client_id='admin-cli',
+                                                                 client_secret_key=None,
+                                                                 verify=False,
+                                                                 custom_headers=headers)
+
+                        expected_header = {'Authorization': 'Bearer faketoken',
+                                           'Content-Type': 'application/json',
+                                           'Custom': 'test-custom-header'
+                                           }
+
+                        mock_connection_manager.assert_called_with(base_url=server_url,
+                                                                   headers=expected_header,
+                                                                   timeout=60,
+                                                                   verify=False)
+                        mock_connection_manager_delete.assert_called_once_with()