From c715b524210050bdd2a2e233817246d443bbb236 Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Mon, 3 May 2021 17:45:02 +0200 Subject: bpo-43943: ssl tests: Increase server socket timeout, backlog, debugging (GH-25850) Signed-off-by: Christian Heimes --- Lib/test/test_ssl.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index acb64f1..00d5eff 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -2587,8 +2587,8 @@ class ThreadedEchoServer(threading.Thread): threading.Thread.start(self) def run(self): - self.sock.settimeout(0.05) - self.sock.listen() + self.sock.settimeout(1.0) + self.sock.listen(5) self.active = True if self.flag: # signal an event @@ -2602,8 +2602,9 @@ class ThreadedEchoServer(threading.Thread): handler = self.ConnectionHandler(self, newconn, connaddr) handler.start() handler.join() - except TimeoutError: - pass + except TimeoutError as e: + if support.verbose: + sys.stdout.write(f' connection timeout {e!r}\n') except KeyboardInterrupt: self.stop() except BaseException as e: @@ -2611,7 +2612,12 @@ class ThreadedEchoServer(threading.Thread): sys.stdout.write( ' connection handling failed: ' + repr(e) + '\n') - self.sock.close() + self.close() + + def close(self): + if self.sock is not None: + self.sock.close() + self.sock = None def stop(self): self.active = False -- cgit v0.12