Merge pull request #338 from OpenKMIP/feat/update-client-close

Updating the ProxyKmipClient to simplify closing
This commit is contained in:
Peter Hamilton 2017-09-21 14:24:40 -04:00 committed by GitHub
commit 833b936603
2 changed files with 3 additions and 5 deletions

View File

@ -134,11 +134,10 @@ class ProxyKmipClient(api.KmipClient):
Close the client connection. Close the client connection.
Raises: Raises:
ClientConnectionNotOpen: if the client connection is not open
Exception: if an error occurs while trying to close the connection Exception: if an error occurs while trying to close the connection
""" """
if not self._is_open: if not self._is_open:
raise exceptions.ClientConnectionNotOpen() return
else: else:
try: try:
self.proxy.close() self.proxy.close()

View File

@ -115,11 +115,10 @@ class TestProxyKmipClient(testtools.TestCase):
mock.MagicMock(spec_set=KMIPProxy)) mock.MagicMock(spec_set=KMIPProxy))
def test_close_on_close(self): def test_close_on_close(self):
""" """
Test that a ClientConnectionNotOpen exception is raised when trying Test that a closed client connection can be closed with no error.
to close a closed client connection.
""" """
client = ProxyKmipClient() client = ProxyKmipClient()
self.assertRaises(ClientConnectionNotOpen, client.close) client.close()
@mock.patch('kmip.pie.client.KMIPProxy', @mock.patch('kmip.pie.client.KMIPProxy',
mock.MagicMock(spec_set=KMIPProxy)) mock.MagicMock(spec_set=KMIPProxy))