Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tiran merged 1 commit into from
May 3, 2021
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions Lib/test/test_ssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2587,8 +2587,8 @@ def start(self, flag=None):
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
Expand All @@ -2602,16 +2602,22 @@ def run(self):
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:
if support.verbose and self.chatty:
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
Expand Down