jgaunt/pykmip
2
0
Fork 0
mirror of https://github.com/openkmip/pykmip synced 2025-12-29 22:53:26 +00:00
Code Issues Releases Wiki Activity

Fixing bug terminating connection prematurely

Browse Source 
This change fixes a bug with the KmipSession connection handling logic
that would terminate the connection before actually receiving a
termination from the client. The corresponding unit tests have been
updated to reflect this fix.
This commit is contained in:
Peter
2016-04-05 08:43:51 -04:00
parent 77f1b1223c
commit b2714002b6
3 changed files with 46 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
kmip/tests/unit/services/server/test_session.py
View File

@@ -19,6 +19,7 @@ import testtools
import time
from kmip.core import enums
from kmip.core import exceptions
from kmip.core import utils
from kmip.core.messages import contents
@@ -58,13 +59,18 @@ class TestKmipSession(testtools.TestCase):
"""
kmip_session = session.KmipSession(None, None, 'name')
kmip_session._logger = mock.MagicMock()
kmip_session._handle_message_loop = mock.MagicMock()
kmip_session._handle_message_loop = mock.MagicMock(
side_effect=[
None,
exceptions.ConnectionClosed()
]
)
kmip_session._connection = mock.MagicMock()
kmip_session.run()
kmip_session._logger.info.assert_any_call("Starting session: name")
kmip_session._handle_message_loop.assert_called_once_with()
self.assertTrue(kmip_session._handle_message_loop.called)
kmip_session._connection.shutdown.assert_called_once_with(
socket.SHUT_RDWR
)
@@ -82,13 +88,16 @@ class TestKmipSession(testtools.TestCase):
test_exception = Exception("test")
kmip_session._handle_message_loop = mock.MagicMock(
side_effect=test_exception
side_effect=[
test_exception,
exceptions.ConnectionClosed()
]
)
kmip_session.run()
kmip_session._logger.info.assert_any_call("Starting session: name")
kmip_session._handle_message_loop.assert_called_once_with()
self.assertTrue(kmip_session._handle_message_loop.called)
kmip_session._logger.info.assert_any_call(
"Failure handling message loop"
)
@@ -267,6 +276,17 @@ class TestKmipSession(testtools.TestCase):
kmip_session._connection.recv.assert_called_with(8)
self.assertEqual(content + content, observed)
kmip_session._connection.recv = mock.MagicMock(
side_effect=['']
)
args = (8, )
self.assertRaises(
exceptions.ConnectionClosed,
kmip_session._receive_bytes,
*args
)
def test_receive_bytes_with_bad_length(self):
"""
Test that the session generates an error on an incorrectly sized