diff options
author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-22 13:22:28 +0200 |
---|---|---|
committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-05-22 13:22:28 +0200 |
commit | 4d810a88d85abf16018a01c8c2b44192d1131cc6 (patch) | |
tree | 36f302496c16359d974c47dd9d7b8a77c5be9de0 | |
parent | e34fddd499be36f24e609838958b6a2a9c49751b (diff) | |
download | cpython-4d810a88d85abf16018a01c8c2b44192d1131cc6.tar.gz |
Issue #12012: test_ssl uses test_support.import_module()
Skip the whole file if the SSL module is missing. It was already the case,
except that the SkipTest exception was raised in test_main().
This commit fixes an error in test_ssl if the ssl module is missing.
-rw-r--r-- | Lib/test/test_ssl.py | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/Lib/test/test_ssl.py b/Lib/test/test_ssl.py index be2f51acaf..3df4d0c34c 100644 --- a/Lib/test/test_ssl.py +++ b/Lib/test/test_ssl.py @@ -20,12 +20,7 @@ import platform from BaseHTTPServer import HTTPServer from SimpleHTTPServer import SimpleHTTPRequestHandler -# Optionally test SSL support, if we have it in the tested platform -skip_expected = False -try: - import ssl -except ImportError: - skip_expected = True +ssl = test_support.import_module("ssl") HOST = test_support.HOST CERTFILE = None @@ -1334,9 +1329,6 @@ else: def test_main(verbose=False): - if skip_expected: - raise unittest.SkipTest("No SSL support") - global CERTFILE, SVN_PYTHON_ORG_ROOT_CERT CERTFILE = os.path.join(os.path.dirname(__file__) or os.curdir, "keycert.pem") |