diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 03:10:31 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2012-11-29 03:10:31 (GMT) |
| commit | 159f12e3350f0986e57a1b86017d8f189f43fef9 (patch) | |
| tree | bb007e876b1186935a668c4012cc56f6c9a8b41e /Lib | |
| parent | 4cee810f5d0376ba32f893340e9a5fefc1b56e05 (diff) | |
| parent | 4927633ab6c6895621d88d51ae2d7943426e2c04 (diff) | |
| download | cpython-159f12e3350f0986e57a1b86017d8f189f43fef9.zip cpython-159f12e3350f0986e57a1b86017d8f189f43fef9.tar.gz cpython-159f12e3350f0986e57a1b86017d8f189f43fef9.tar.bz2 | |
#16549: merge with 3.2.
Diffstat (limited to 'Lib')
| -rw-r--r-- | 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 index 1f2c8a2..0c39e56 100644 --- a/Lib/test/json_tests/test_tool.py +++ b/Lib/test/json_tests/test_tool.py @@ -42,7 +42,7 @@ class TestTool(unittest.TestCase): (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 @@ class TestTool(unittest.TestCase): 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): |