From: Christian Heimes <christian@python.org>
Date: Mon, 3 May 2021 15:45:02 +0000 (+0200)
Subject: bpo-43943: ssl tests: Increase server socket timeout, backlog, debugging (GH-25850)
X-Git-Tag: v3.10.0b1~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c715b524210050bdd2a2e233817246d443bbb236;p=thirdparty%2FPython%2Fcpython.git

bpo-43943: ssl tests: Increase server socket timeout, backlog, debugging (GH-25850)

Signed-off-by: Christian Heimes <christian@python.org>
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index acb64f15fa0d..00d5eff81537 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