summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Coghlan <ncoghlan@gmail.com>2013-11-30 08:35:32 (GMT)
committerNick Coghlan <ncoghlan@gmail.com>2013-11-30 08:35:32 (GMT)
commit8ddd59e870c0a0624f54a415297350f57ac9b57f (patch)
treeffced33874e0ebf03ca5101353aa60b4501f8c7d
parent60f08c83f977ffd6474c292a10669061b5dcc413 (diff)
downloadcpython-8ddd59e870c0a0624f54a415297350f57ac9b57f.zip
cpython-8ddd59e870c0a0624f54a415297350f57ac9b57f.tar.gz
cpython-8ddd59e870c0a0624f54a415297350f57ac9b57f.tar.bz2
Issue #19728: don't be sensitive to line endings
-rw-r--r--Lib/test/test_venv.py14
1 files changed, 5 insertions, 9 deletions
diff --git a/Lib/test/test_venv.py b/Lib/test/test_venv.py
index c15610b..eb225fa 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()