[Python-checkins] cpython: Avoid global side effect in test_ensurepip

[nick.coghlan]

http://hg.python.org/cpython/rev/10cbc2ca579c
changeset:   87078:10cbc2ca579c
user:        Nick Coghlan <ncoghlan at gmail.com>
date:        Wed Nov 13 22:24:58 2013 +1000
summary:
  Avoid global side effect in test_ensurepip

files:
  Lib/test/test_ensurepip.py |  11 ++++++++---
  1 files changed, 8 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_ensurepip.py b/Lib/test/test_ensurepip.py
--- a/Lib/test/test_ensurepip.py
+++ b/Lib/test/test_ensurepip.py
@@ -2,6 +2,8 @@
 import unittest.mock
 import ensurepip
 import test.support
+import os
+import os.path
 
 
 class TestEnsurePipVersion(unittest.TestCase):
@@ -17,9 +19,12 @@
         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()

-- 
Repository URL: http://hg.python.org/cpython