From: Antoine Pitrou <solipsis@pitrou.net>
Date: Wed, 4 Aug 2010 16:45:21 +0000 (+0000)
Subject: In verbose mode, identify OpenSSL build and platform more precisely
X-Git-Tag: v3.2a2~469
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=15cee6209f9ce6d3d2d357ce60ac4ab754a7a104;p=thirdparty%2FPython%2Fcpython.git

In verbose mode, identify OpenSSL build and platform more precisely
---

diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py
index 9c0d263e0f1e..26fcf1b8ff5f 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,