[Python-checkins] cpython (merge 3.5 -> 3.6): Make Lib/test/ssltests.py more useful and faster for OpenSSL testing

Thu Sep 22 10:54:14 EDT 2016

https://hg.python.org/cpython/rev/d020f7290561
changeset: 104012:d020f7290561
branch: 3.6
parent: 104008:9929462be9c7
parent: 104011:e629aafdf777
user: Christian Heimes <christian at python.org>
date: Thu Sep 22 16:49:51 2016 +0200
summary:
 Make Lib/test/ssltests.py more useful and faster for OpenSSL testing
files:
 Lib/test/ssltests.py | 27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Lib/test/ssltests.py b/Lib/test/ssltests.py
--- a/Lib/test/ssltests.py
+++ b/Lib/test/ssltests.py
@@ -1,17 +1,32 @@
-# Convenience test module to run all of the SSL-related tests in the
+# Convenience test module to run all of the OpenSSL-related tests in the
 # standard library.
 
+import ssl
 import sys
 import subprocess
 
-TESTS = ['test_asyncio', 'test_ftplib', 'test_hashlib', 'test_httplib',
- 'test_imaplib', 'test_nntplib', 'test_poplib', 'test_smtplib',
- 'test_smtpnet', 'test_urllib2_localnet', 'test_venv']
+TESTS = [
+ 'test_asyncio', 'test_ensurepip.py', 'test_ftplib', 'test_hashlib',
+ 'test_hmac', 'test_httplib', 'test_imaplib', 'test_nntplib',
+ 'test_poplib', 'test_ssl', 'test_smtplib', 'test_smtpnet',
+ 'test_urllib2_localnet', 'test_venv', 'test_xmlrpc'
+]
 
 def run_regrtests(*extra_args):
- args = [sys.executable, "-m", "test"]
+ print(ssl.OPENSSL_VERSION)
+ args = [
+ sys.executable,
+ '-Werror', '-bb', # turn warnings into exceptions
+ '-m', 'test',
+ ]
 if not extra_args:
- args.append("-unetwork")
+ args.extend([
+ '-r', # randomize
+ '-w', # re-run failed tests with -v
+ '-u', 'network', # use network
+ '-u', 'urlfetch', # download test vectors
+ '-j', '0' # use multiple CPUs
+ ])
 else:
 args.extend(extra_args)
 args.extend(TESTS)
-- 
Repository URL: https://hg.python.org/cpython
