From c12fef9aa3282144dba83e0cd543bb510de6a745 Mon Sep 17 00:00:00 2001 From: Martin Panter Date: Thu, 18 Feb 2016 10:43:55 +0000 Subject: Issue #26309: Shut down socketserver request if verify_request() is false Patch by Aviv Palivoda. --- Lib/test/test_socketserver.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'Lib/test/test_socketserver.py') diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py index 1ea66a6aa3..f8f776294a 100644 --- a/Lib/test/test_socketserver.py +++ b/Lib/test/test_socketserver.py @@ -280,6 +280,30 @@ class SocketServerTest(unittest.TestCase): socketserver.TCPServer((HOST, -1), socketserver.StreamRequestHandler) + def test_shutdown_request_called_if_verify_request_false(self): + # Issue #26309: BaseServer should call shutdown_request even if + # verify_request is False + shutdown_called = False + + class MyServer(socketserver.TCPServer): + def verify_request(self, request, client_address): + return False + + def shutdown_request(self, request): + nonlocal shutdown_called + shutdown_called = True + super().shutdown_request(request) + + def connect_to_server(proto, addr): + s = socket.socket(proto, socket.SOCK_STREAM) + s.connect(addr) + s.close() + + self.run_server(MyServer, + socketserver.StreamRequestHandler, + connect_to_server) + self.assertEqual(shutdown_called, True) + class MiscTestCase(unittest.TestCase): -- cgit v1.2.1