From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sun, 24 Nov 2013 04:58:31 +0000 (+1000)
Subject: Issue #19734: Ensure test_venv ignores PIP_REQUIRE_VIRTUALENV
X-Git-Tag: v3.4.0b1~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=091167c1ca513d74c7a146d6a527e7b8b07ae7e8;p=thirdparty%2FPython%2Fcpython.git

Issue #19734: Ensure test_venv ignores PIP_REQUIRE_VIRTUALENV
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index bc210aa5fe3d..ea49f6ec11ce 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -291,6 +291,10 @@ class EnsurePipTest(BaseTest):
             # warnings in current versions of Python. Ensure related
             # environment settings don't cause venv to fail.
             envvars["PYTHONWARNINGS"] = "e"
+            # pip doesn't ignore environment variables when running in
+            # isolated mode, and we don't have an active virtualenv here
+            # See http://bugs.python.org/issue19734 for details
+            del envvars["PIP_REQUIRE_VIRTUALENV"]
             try:
                 self.run_with_capture(venv.create, self.env_dir, with_pip=True)
             except subprocess.CalledProcessError as exc: