changeset 87651:a0ec33efa743

Issue #19728: don't be sensitive to line endings
author Nick Coghlan <ncoghlan@gmail.com>
date Sat, 30 Nov 2013 18:35:32 +1000
parents 04088790c077
children 1ceb6f84b617
files Lib/test/test_venv.py
diffstat 1 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/Lib/test/test_venv.py	Sat Nov 30 17:45:09 2013 +1000
+++ b/Lib/test/test_venv.py	Sat Nov 30 18:35:32 2013 +1000
@@ -340,17 +340,13 @@
         # 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()