From: Nick Coghlan <ncoghlan@gmail.com>
Date: Sat, 30 Nov 2013 08:35:32 +0000 (+1000)
Subject: Issue #19728: don't be sensitive to line endings
X-Git-Tag: v3.4.0b2~426
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8ddd59e870c0a0624f54a415297350f57ac9b57f;p=python

Issue #19728: don't be sensitive to line endings
---

diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index c15610b25c..eb225fa4ae 100644
--- a/Lib/test/test_venv.py
+++ b/Lib/test/test_venv.py
@@ -340,17 +340,13 @@ class EnsurePipTest(BaseTest):
         # if we get unexpected results
         err = err.decode("latin-1") # Force to text, prevent decoding errors
         self.assertEqual(err, "")
-        # Being really specific regarding the expected behaviour for the
+        # Being fairly specific regarding the expected behaviour for the
         # initial bundling phase in Python 3.4. If the output changes in
-        # future pip versions, this test can be relaxed a bit.
+        # future pip versions, this test can likely be relaxed further.
         out = out.decode("latin-1") # Force to text, prevent decoding errors
-        expected_output = textwrap.dedent("""\
-                            Uninstalling pip:
-                              Successfully uninstalled pip
-                            Uninstalling setuptools:
-                              Successfully uninstalled setuptools
-                            """)
-        self.assertEqual(out, expected_output)
+        self.assertIn("Successfully uninstalled pip", out)
+        self.assertIn("Successfully uninstalled setuptools", out)
+        # Check pip is now gone from the virtual environment
         self.assert_pip_not_installed()