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.
This commit is contained in:
Victor Stinner 2011-05-22 13:22:28 +02:00
parent e91b305d28
commit 2e7f39e889
1 changed files with 1 additions and 9 deletions

View File

@ -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")