Updating the ProxyKmipClient to simplify closing

This change updates the ProxyKmipClient close method, allowing
it to be called without error even when the client connection is
not open. The client unit tests have been updated to reflect this.
This commit is contained in:
Peter Hamilton 2017-09-21 12:57:44 -04:00
parent 7f6f4d004f
commit 31a1d1cec4
2 changed files with 3 additions and 5 deletions

View File

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

View File

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