aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/tests/test_easy_install.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-02-05 21:50:03 -0500
committerJason R. Coombs <jaraco@jaraco.com>2014-02-05 21:50:03 -0500
commit20f0eabf20453410b1beffdd2e0d686f4d711564 (patch)
treed745d044d17327ecdcac15e56ead6f5cb86233c6 /setuptools/tests/test_easy_install.py
parent929245d2582e5dba93540838981494fd5a57dbdf (diff)
downloadexternal_python_setuptools-20f0eabf20453410b1beffdd2e0d686f4d711564.tar.gz
external_python_setuptools-20f0eabf20453410b1beffdd2e0d686f4d711564.tar.bz2
external_python_setuptools-20f0eabf20453410b1beffdd2e0d686f4d711564.zip
Use readlines on StringIO. Ensure quiet_context returns rewound buffers.
Diffstat (limited to 'setuptools/tests/test_easy_install.py')
-rw-r--r--setuptools/tests/test_easy_install.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/setuptools/tests/test_easy_install.py b/setuptools/tests/test_easy_install.py
index fbba1803..d2cc7a0f 100644
--- a/setuptools/tests/test_easy_install.py
+++ b/setuptools/tests/test_easy_install.py
@@ -329,7 +329,7 @@ class TestSetupRequires(unittest.TestCase):
self.fail('Installing setup.py requirements '
'caused a VersionConflict')
- lines = stdout.splitlines()
+ lines = stdout.readlines()
self.assertTrue(len(lines) > 0)
self.assertTrue(lines[-1].strip(), 'test_pkg')
finally:
@@ -450,5 +450,7 @@ def quiet_context():
try:
yield new_stdout, new_stderr
finally:
+ new_stdout.seek(0)
+ new_stderr.seek(0)
sys.stdout = old_stdout
sys.stderr = old_stderr