summaryrefslogtreecommitdiff
path: root/Lib/test/test_ssl.py
diff options
context:
space:
mode:
authorChristian Heimes <christian@python.org>2021-05-03 17:45:02 +0200
committerGitHub <noreply@github.com>2021-05-03 17:45:02 +0200
commitc715b524210050bdd2a2e233817246d443bbb236 (patch)
treefa4a38063d520ee42007b4ef3338506bb60edf2f /Lib/test/test_ssl.py
parent7719953b30430b351ba0f153c2b51b16cc68ee36 (diff)
downloadcpython-git-c715b524210050bdd2a2e233817246d443bbb236.tar.gz
bpo-43943: ssl tests: Increase server socket timeout, backlog, debugging (GH-25850)
Signed-off-by: Christian Heimes <christian@python.org>
Diffstat (limited to 'Lib/test/test_ssl.py')
-rw-r--r--Lib/test/test_ssl.py16
1 files changed, 11 insertions, 5 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index acb64f15fa..00d5eff815 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