Kaydet (Commit) 8ddd59e8 authored tarafından Nick Coghlan's avatar Nick Coghlan

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

üst 60f08c83
...@@ -340,17 +340,13 @@ class EnsurePipTest(BaseTest): ...@@ -340,17 +340,13 @@ class EnsurePipTest(BaseTest):
# if we get unexpected results # if we get unexpected results
err = err.decode("latin-1") # Force to text, prevent decoding errors err = err.decode("latin-1") # Force to text, prevent decoding errors
self.assertEqual(err, "") 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 # 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 out = out.decode("latin-1") # Force to text, prevent decoding errors
expected_output = textwrap.dedent("""\ self.assertIn("Successfully uninstalled pip", out)
Uninstalling pip: self.assertIn("Successfully uninstalled setuptools", out)
Successfully uninstalled pip # Check pip is now gone from the virtual environment
Uninstalling setuptools:
Successfully uninstalled setuptools
""")
self.assertEqual(out, expected_output)
self.assert_pip_not_installed() self.assert_pip_not_installed()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment