]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Fix test_venv to work with universal newlines (issue #13119)
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 4 Aug 2012 22:33:10 +0000 (00:33 +0200)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 4 Aug 2012 22:33:10 +0000 (00:33 +0200)
Lib/test/test_venv.py

index b1b831e3a3dedd78c9d4416679bd513ad3deb725..96968444c60d82db9b34c7f1da7ff61007073f16 100644 (file)
@@ -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)