diff options
author | Victor Stinner <victor.stinner@gmail.com> | 2015-01-28 23:52:07 +0100 |
---|---|---|
committer | Victor Stinner <victor.stinner@gmail.com> | 2015-01-28 23:52:07 +0100 |
commit | 38cce057ca9eaf0b78bdf0e944afda8a96b63003 (patch) | |
tree | 4f952a50abf8fdda20baa48a67bfadfe2cf1cc41 /tests/test_sslproto.py | |
parent | f437214c06080cf965e37d6ffbbc35590562cece (diff) | |
download | trollius-38cce057ca9eaf0b78bdf0e944afda8a96b63003.tar.gz |
Fix SSLProtocol.eof_received()
Wake-up the waiter if it is not done yet.
Diffstat (limited to 'tests/test_sslproto.py')
-rw-r--r-- | tests/test_sslproto.py | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/tests/test_sslproto.py b/tests/test_sslproto.py index b1a61c4..148e30d 100644 --- a/tests/test_sslproto.py +++ b/tests/test_sslproto.py @@ -12,21 +12,36 @@ from asyncio import sslproto from asyncio import test_utils +@unittest.skipIf(ssl is None, 'No ssl module') class SslProtoHandshakeTests(test_utils.TestCase): def setUp(self): self.loop = asyncio.new_event_loop() self.set_event_loop(self.loop) - @unittest.skipIf(ssl is None, 'No ssl module') + def ssl_protocol(self, waiter=None): + sslcontext = test_utils.dummy_ssl_context() + app_proto = asyncio.Protocol() + return sslproto.SSLProtocol(self.loop, app_proto, sslcontext, waiter) + + def connection_made(self, ssl_proto, do_handshake=None): + transport = mock.Mock() + sslpipe = mock.Mock() + sslpipe.shutdown.return_value = b'' + if do_handshake: + sslpipe.do_handshake.side_effect = do_handshake + else: + def mock_handshake(callback): + return [] + sslpipe.do_handshake.side_effect = mock_handshake + with mock.patch('asyncio.sslproto._SSLPipe', return_value=sslpipe): + ssl_proto.connection_made(transport) + def test_cancel_handshake(self): # Python issue #23197: cancelling an handshake must not raise an # exception or log an error, even if the handshake failed - sslcontext = test_utils.dummy_ssl_context() - app_proto = asyncio.Protocol() waiter = asyncio.Future(loop=self.loop) - ssl_proto = sslproto.SSLProtocol(self.loop, app_proto, sslcontext, - waiter) + ssl_proto = self.ssl_protocol(waiter) handshake_fut = asyncio.Future(loop=self.loop) def do_handshake(callback): @@ -36,12 +51,7 @@ class SslProtoHandshakeTests(test_utils.TestCase): return [] waiter.cancel() - transport = mock.Mock() - sslpipe = mock.Mock() - sslpipe.shutdown.return_value = b'' - sslpipe.do_handshake.side_effect = do_handshake - with mock.patch('asyncio.sslproto._SSLPipe', return_value=sslpipe): - ssl_proto.connection_made(transport) + self.connection_made(ssl_proto, do_handshake) with test_utils.disable_logger(): self.loop.run_until_complete(handshake_fut) @@ -49,6 +59,14 @@ class SslProtoHandshakeTests(test_utils.TestCase): # Close the transport ssl_proto._app_transport.close() + def test_eof_received_waiter(self): + waiter = asyncio.Future(loop=self.loop) + ssl_proto = self.ssl_protocol(waiter) + self.connection_made(ssl_proto) + ssl_proto.eof_received() + test_utils.run_briefly(self.loop) + self.assertIsInstance(waiter.exception(), ConnectionResetError) + if __name__ == '__main__': unittest.main() |