From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 4 Aug 2012 22:33:10 +0000 (+0200)
Subject: Fix test_venv to work with universal newlines (issue #13119)
X-Git-Tag: v3.3.0b2~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c92a691e1f0f889fffd22a48d02ceaea38c05c6;p=thirdparty%2FPython%2Fcpython.git

Fix test_venv to work with universal newlines (issue #13119)
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index b1b831e3a3de..96968444c60d 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -111,7 +111,7 @@ class BasicTest(BaseTest):
             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 @@ class BasicTest(BaseTest):
         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 @@ class BasicTest(BaseTest):
         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)