diff options
author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-11-01 22:38:44 (GMT) |
---|---|---|
committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-11-01 22:38:44 (GMT) |
commit | 2f9197f95518756386f04023f954976c2be010f8 (patch) | |
tree | 8e227762368ebf870467857f05f943d88ff8fb8b /Lib/distutils/tests/test_util.py | |
parent | fd0680b19dfccf7bdb8b3f5e90c2e0bc2fd2aa00 (diff) | |
download | cpython-2f9197f95518756386f04023f954976c2be010f8.zip cpython-2f9197f95518756386f04023f954976c2be010f8.tar.gz cpython-2f9197f95518756386f04023f954976c2be010f8.tar.bz2 |
Merged revisions 76042 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76042 | tarek.ziade | 2009-11-01 23:33:45 +0100 (Sun, 01 Nov 2009) | 1 line
fixed stdout alteration in test_distutils
........
Diffstat (limited to 'Lib/distutils/tests/test_util.py')
-rw-r--r-- | Lib/distutils/tests/test_util.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/distutils/tests/test_util.py b/Lib/distutils/tests/test_util.py index a2f8ed2..4172472 100644 --- a/Lib/distutils/tests/test_util.py +++ b/Lib/distutils/tests/test_util.py @@ -60,6 +60,8 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): util.find_executable = self._find_executable self._exes = {} self.old_popen = subprocess.Popen + self.old_stdout = sys.stdout + self.old_stderr = sys.stderr FakePopen.test_class = self subprocess.Popen = FakePopen @@ -79,6 +81,8 @@ class UtilTestCase(support.EnvironGuard, unittest.TestCase): sysconfig._config_vars = copy(self._config_vars) util.find_executable = self.old_find_executable subprocess.Popen = self.old_popen + sys.old_stdout = self.old_stdout + sys.old_stderr = self.old_stderr super(UtilTestCase, self).tearDown() def _set_uname(self, uname): |