mirror of
https://github.com/python/cpython.git
synced 2025-08-08 10:58:51 +00:00
0855b2c8b6
* gh-108834: regrtest reruns failed tests in subprocesses (#108839) When using --rerun option, regrtest now re-runs failed tests in verbose mode in fresh worker processes to have more deterministic behavior. So it can write its final report even if a test killed a worker progress. Add --fail-rerun option to regrtest: exit with non-zero exit code if a test failed pass passed when re-run in verbose mode (in a fresh process). That's now more useful since tests can pass when re-run in a fresh worker progress, whereas they failed when run after other tests when tests are run sequentially. Rename --verbose2 option (-w) to --rerun. Keep --verbose2 as a deprecated alias. Changes: * Fix and enhance statistics in regrtest summary. Add "(filtered)" when --match and/or --ignore options are used. * Add RunTests class. * Add TestResult.get_rerun_match_tests() method * Rewrite code to serialize/deserialize worker arguments as JSON using a new WorkerJob class. * Fix stats when a test is run with --forever --rerun. * If failed test names cannot be parsed, log a warning and don't filter tests. * test_regrtest.test_rerun_success() now uses a marker file, since the test is re-run in a separated process. * Add tests on normalize_test_name() function. * Add test_success() and test_skip() tests to test_regrtest. (cherry picked from commit31c2945f14) * gh-108834: regrtest --fail-rerun exits with code 5 (#108896) When the --fail-rerun option is used and a test fails and then pass, regrtest now uses exit code 5 ("rerun) instead of 2 ("bad test"). (cherry picked from commit1170d5a292) * gh-108416: Mark slow but not CPU bound test methods with requires_resource('walltime') (GH-108480) (cherry picked from commit1e0d62793a) * Manually sync Lib/test/libregrtest/ from main --------- Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
90 lines
3 KiB
Python
90 lines
3 KiB
Python
import unittest
|
|
from test import support
|
|
from test.support import import_helper
|
|
from test.support import socket_helper
|
|
import smtplib
|
|
import socket
|
|
|
|
ssl = import_helper.import_module("ssl")
|
|
|
|
support.requires("network")
|
|
|
|
def check_ssl_verifiy(host, port):
|
|
context = ssl.create_default_context()
|
|
with socket.create_connection((host, port)) as sock:
|
|
try:
|
|
sock = context.wrap_socket(sock, server_hostname=host)
|
|
except Exception:
|
|
return False
|
|
else:
|
|
sock.close()
|
|
return True
|
|
|
|
|
|
class SmtpTest(unittest.TestCase):
|
|
testServer = 'smtp.gmail.com'
|
|
remotePort = 587
|
|
|
|
def test_connect_starttls(self):
|
|
support.get_attribute(smtplib, 'SMTP_SSL')
|
|
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
|
|
context.check_hostname = False
|
|
context.verify_mode = ssl.CERT_NONE
|
|
with socket_helper.transient_internet(self.testServer):
|
|
server = smtplib.SMTP(self.testServer, self.remotePort)
|
|
try:
|
|
server.starttls(context=context)
|
|
except smtplib.SMTPException as e:
|
|
if e.args[0] == 'STARTTLS extension not supported by server.':
|
|
unittest.skip(e.args[0])
|
|
else:
|
|
raise
|
|
server.ehlo()
|
|
server.quit()
|
|
|
|
|
|
class SmtpSSLTest(unittest.TestCase):
|
|
testServer = 'smtp.gmail.com'
|
|
remotePort = 465
|
|
|
|
def test_connect(self):
|
|
support.get_attribute(smtplib, 'SMTP_SSL')
|
|
with socket_helper.transient_internet(self.testServer):
|
|
server = smtplib.SMTP_SSL(self.testServer, self.remotePort)
|
|
server.ehlo()
|
|
server.quit()
|
|
|
|
def test_connect_default_port(self):
|
|
support.get_attribute(smtplib, 'SMTP_SSL')
|
|
with socket_helper.transient_internet(self.testServer):
|
|
server = smtplib.SMTP_SSL(self.testServer)
|
|
server.ehlo()
|
|
server.quit()
|
|
|
|
@support.requires_resource('walltime')
|
|
def test_connect_using_sslcontext(self):
|
|
context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
|
|
context.check_hostname = False
|
|
context.verify_mode = ssl.CERT_NONE
|
|
support.get_attribute(smtplib, 'SMTP_SSL')
|
|
with socket_helper.transient_internet(self.testServer):
|
|
server = smtplib.SMTP_SSL(self.testServer, self.remotePort, context=context)
|
|
server.ehlo()
|
|
server.quit()
|
|
|
|
def test_connect_using_sslcontext_verified(self):
|
|
with socket_helper.transient_internet(self.testServer):
|
|
can_verify = check_ssl_verifiy(self.testServer, self.remotePort)
|
|
if not can_verify:
|
|
self.skipTest("SSL certificate can't be verified")
|
|
|
|
support.get_attribute(smtplib, 'SMTP_SSL')
|
|
context = ssl.create_default_context()
|
|
with socket_helper.transient_internet(self.testServer):
|
|
server = smtplib.SMTP_SSL(self.testServer, self.remotePort, context=context)
|
|
server.ehlo()
|
|
server.quit()
|
|
|
|
|
|
if __name__ == "__main__":
|
|
unittest.main()
|