[Python-checkins] cpython: Fix test_venv to work with universal newlines (issue #13119)

Sun Aug 5 00:35:53 CEST 2012

http://hg.python.org/cpython/rev/f8e435d6a801
changeset: 78423:f8e435d6a801
user: Antoine Pitrou <solipsis at pitrou.net>
date: Sun Aug 05 00:33:10 2012 +0200
summary:
 Fix test_venv to work with universal newlines (issue #13119)
files:
 Lib/test/test_venv.py | 6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -111,7 +111,7 @@
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
 stderr=subprocess.PIPE)
 out, err = p.communicate()
- self.assertEqual(out[:-1], expected.encode())
+ self.assertEqual(out.strip(), expected.encode())
 
 def test_overwrite_existing(self):
 """
@@ -179,7 +179,7 @@
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
 stderr=subprocess.PIPE)
 out, err = p.communicate()
- self.assertEqual(out[:-1], envpy.encode())
+ self.assertEqual(out.strip(), envpy.encode())
 
 @unittest.skipUnless(can_symlink(), 'Needs symlinks')
 def test_executable_symlinks(self):
@@ -194,7 +194,7 @@
 p = subprocess.Popen(cmd, stdout=subprocess.PIPE,
 stderr=subprocess.PIPE)
 out, err = p.communicate()
- self.assertEqual(out[:-1], envpy.encode())
+ self.assertEqual(out.strip(), envpy.encode())
 
 def test_main():
 run_unittest(BasicTest)
-- 
Repository URL: http://hg.python.org/cpython
