From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 24 Nov 2013 02:45:25 +0000 (+1000)
Subject: Issue #19744 (temp workaround): without ssl, skip pip test
X-Git-Tag: v3.4.0b1~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=878d258a22c6f40401671dd329b76516a03a2b71;p=thirdparty%2FPython%2Fcpython.git

Issue #19744 (temp workaround): without ssl, skip pip test
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 613d9c3a6a39..bc210aa5fe3d 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -15,6 +15,10 @@ from test.support import (captured_stdout, captured_stderr, run_unittest,
                           can_symlink, EnvironmentVarGuard)
 import unittest
 import venv
+try:
+    import ssl
+except ImportError:
+    ssl = None
 
 skipInVenv = unittest.skipIf(sys.prefix != sys.base_prefix,
                              'Test not appropriate in a venv')
@@ -278,6 +282,8 @@ class EnsurePipTest(BaseTest):
         self.assertEqual(err, b"")
         self.assertEqual(out.strip(), b"OK")
 
+    # Temporary skip for http://bugs.python.org/issue19744
+    @unittest.skipIf(ssl is None, 'pip needs SSL support')
     def test_with_pip(self):
         shutil.rmtree(self.env_dir)
         with EnvironmentVarGuard() as envvars: