# HG changeset patch # User Gregory Szorc # Date 2016-07-14 03:41:07 # Node ID 1b8b6adb2365b4f8674b7c4964be0c2d234cd6a5 # Parent 121d11814c62ed29636aabbc8af801ee80126225 tests: use sslutil.wrapserversocket() Like the built-in HTTPS server, this code was using the ssl module directly and only using TLS 1.0. Like the built-in HTTPS server, we switch it to use sslutil.wrapserversocket() so it can follow better practices. diff --git a/tests/dummysmtpd.py b/tests/dummysmtpd.py --- a/tests/dummysmtpd.py +++ b/tests/dummysmtpd.py @@ -12,6 +12,8 @@ import sys from mercurial import ( cmdutil, + sslutil, + ui as uimod, ) def log(msg): @@ -35,11 +37,10 @@ class dummysmtpsecureserver(dummysmtpser if not pair: return conn, addr = pair + ui = uimod.ui() try: # wrap_socket() would block, but we don't care - conn = ssl.wrap_socket(conn, server_side=True, - certfile=self._certfile, - ssl_version=ssl.PROTOCOL_TLSv1) + conn = sslutil.wrapserversocket(conn, ui, certfile=self._certfile) except ssl.SSLError: log('%s ssl error\n' % addr[0]) conn.close()