From: Berker Peksag <berker.peksag@gmail.com>
Date: Tue, 19 Jan 2016 00:01:53 +0000 (+0200)
Subject: Issue #25366: Skip test_with_pip when threading module is not available
X-Git-Tag: v3.6.0a1~743^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b25eff76e2601626b9784c6366ebfc3c7f99235;p=thirdparty%2FPython%2Fcpython.git

Issue #25366: Skip test_with_pip when threading module is not available

Some dependencies of pip import threading module unconditionally so
we need to skip the test to make buildbots happy.
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index 9207a685ab83..28b0f6c3e3d2 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -25,6 +25,11 @@ try:
 except ImportError:
     ssl = None
 
+try:
+    import threading
+except ImportError:
+    threading = None
+
 skipInVenv = unittest.skipIf(sys.prefix != sys.base_prefix,
                              'Test not appropriate in a venv')
 
@@ -319,6 +324,8 @@ class EnsurePipTest(BaseTest):
 
     # Requesting pip fails without SSL (http://bugs.python.org/issue19744)
     @unittest.skipIf(ssl is None, ensurepip._MISSING_SSL_MESSAGE)
+    @unittest.skipUnless(threading, 'some dependencies of pip import threading'
+                                    ' module unconditionally')
     def test_with_pip(self):
         rmtree(self.env_dir)
         with EnvironmentVarGuard() as envvars: