From: Nick Coghlan <ncoghlan@gmail.com>
Date: Wed, 13 Nov 2013 12:24:58 +0000 (+1000)
Subject: Avoid global side effect in test_ensurepip
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3e83e2a3e88cc424d14d9aaff09d03feed1a10f;p=python

Avoid global side effect in test_ensurepip
---

diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
index e87f476eac..abf00fd188 100644
--- a/Lib/test/test_ensurepip.py
+++ b/Lib/test/test_ensurepip.py
@@ -2,6 +2,8 @@ import unittest
 import unittest.mock
 import ensurepip
 import test.support
+import os
+import os.path
 
 
 class TestEnsurePipVersion(unittest.TestCase):
@@ -17,9 +19,12 @@ class TestBootstrap(unittest.TestCase):
         self.run_pip = run_pip_patch.start()
         self.addCleanup(run_pip_patch.stop)
 
-        os_environ_patch = unittest.mock.patch("ensurepip.os.environ", {})
-        self.os_environ = os_environ_patch.start()
-        self.addCleanup(os_environ_patch.stop)
+        # Avoid side effects on the actual os module
+        os_patch = unittest.mock.patch("ensurepip.os")
+        patched_os = os_patch.start()
+        self.addCleanup(os_patch.stop)
+        patched_os.path = os.path
+        self.os_environ = patched_os.environ = os.environ.copy()
 
     def test_basic_bootstrapping(self):
         ensurepip.bootstrap()