summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_venv.py
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-12-23 13:07:07 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-12-23 13:07:07 (GMT)
commitae2ee96ad797435963e9aa13d54d52db765486c9 (patch)
tree19001152d5edc3130008f609b2ca9cadf80d2f41 /Lib/test/test_venv.py
parentf71cae0a93ea0f8ba83da06bdd71709443d521b6 (diff)
downloadcpython-ae2ee96ad797435963e9aa13d54d52db765486c9.zip
cpython-ae2ee96ad797435963e9aa13d54d52db765486c9.tar.gz
cpython-ae2ee96ad797435963e9aa13d54d52db765486c9.tar.bz2
Issue #19744: improve ensurepip error when ssl is missing
Diffstat (limited to 'Lib/test/test_venv.py')
-rw-r--r--Lib/test/test_venv.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index e8437cf..3dfed35 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -17,6 +17,9 @@ from test.support import (captured_stdout, captured_stderr, run_unittest,
import textwrap
import unittest
import venv
+
+# pip currently requires ssl support, so we ensure we handle
+# it being missing (http://bugs.python.org/issue19744)
try:
import ssl
except ImportError:
@@ -285,8 +288,8 @@ class EnsurePipTest(BaseTest):
self.run_with_capture(venv.create, self.env_dir, with_pip=False)
self.assert_pip_not_installed()
- # Temporary skip for http://bugs.python.org/issue19744
- @unittest.skipIf(ssl is None, 'pip needs SSL support')
+ # Requesting pip fails without SSL (http://bugs.python.org/issue19744)
+ @unittest.skipIf(ssl is None, ensurepip._MISSING_SSL_MESSAGE)
def test_with_pip(self):
shutil.rmtree(self.env_dir)
with EnvironmentVarGuard() as envvars: