[Python-checkins] cpython (3.2): #16549: fix test failures on Windows.

Thu Nov 29 04:11:00 CET 2012

http://hg.python.org/cpython/rev/4ec9f0b0f8f1
changeset: 80645:4ec9f0b0f8f1
branch: 3.2
parent: 80640:6996a53f13ce
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Thu Nov 29 05:10:07 2012 +0200
summary:
 #16549: fix test failures on Windows.
files:
 Lib/test/json_tests/test_tool.py | 4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Lib/test/json_tests/test_tool.py b/Lib/test/json_tests/test_tool.py
--- a/Lib/test/json_tests/test_tool.py
+++ b/Lib/test/json_tests/test_tool.py
@@ -42,7 +42,7 @@
 (sys.executable, '-m', 'json.tool'),
 stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
 out, err = proc.communicate(self.data.encode())
- self.assertEqual(out, self.expect.encode())
+ self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
 self.assertEqual(err, None)
 
 def _create_infile(self):
@@ -55,7 +55,7 @@
 def test_infile_stdout(self):
 infile = self._create_infile()
 rc, out, err = assert_python_ok('-m', 'json.tool', infile)
- self.assertEqual(out, self.expect.encode())
+ self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
 self.assertEqual(err, b'')
 
 def test_infile_outfile(self):
-- 
Repository URL: http://hg.python.org/cpython
