summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-08-04 16:45:21 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-08-04 16:45:21 (GMT)
commit15cee6209f9ce6d3d2d357ce60ac4ab754a7a104 (patch)
tree9fc69b3b09df0b73e927cb88cf2b4057e57c4629
parenta6a3274aadfbf9ce03addbef5a68f7701458a3a6 (diff)
downloadcpython-15cee6209f9ce6d3d2d357ce60ac4ab754a7a104.zip
cpython-15cee6209f9ce6d3d2d357ce60ac4ab754a7a104.tar.gz
cpython-15cee6209f9ce6d3d2d357ce60ac4ab754a7a104.tar.bz2
In verbose mode, identify OpenSSL build and platform more precisely
-rw-r--r--Lib/test/test_ssl.py18
1 files changed, 18 insertions, 0 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 9c0d263..26fcf1b 100644
--- a/Lib/test/test_ssl.py
+++ b/Lib/test/test_ssl.py
@@ -15,6 +15,7 @@ import urllib.parse, urllib.request
import traceback
import asyncore
import weakref
+import platform
from http.server import HTTPServer, SimpleHTTPRequestHandler
@@ -1424,6 +1425,23 @@ def test_main(verbose=False):
if skip_expected:
raise unittest.SkipTest("No SSL support")
+ if support.verbose:
+ plats = {
+ 'Linux': platform.linux_distribution,
+ 'Mac': platform.mac_ver,
+ 'Windows': platform.win32_ver,
+ }
+ for name, func in plats.items():
+ plat = func()
+ if plat and plat[0]:
+ plat = '%s %r' % (name, plat)
+ break
+ else:
+ plat = repr(platform.platform())
+ print("test_ssl: testing with %r %r" %
+ (ssl.OPENSSL_VERSION, ssl.OPENSSL_VERSION_INFO))
+ print(" under %s" % plat)
+
for filename in [
CERTFILE, SVN_PYTHON_ORG_ROOT_CERT, BYTES_CERTFILE,
ONLYCERT, ONLYKEY, BYTES_ONLYCERT, BYTES_ONLYKEY,