summaryrefslogtreecommitdiffstats
path: root/Lib/test/json_tests
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2012-11-29 03:10:45 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2012-11-29 03:10:45 (GMT)
commit63cd0aa5696f9e8220e615369324272136b8ca2e (patch)
tree2d7c3d74861325c97fafa7022f222d77b85c6797 /Lib/test/json_tests
parentfc02014519cd926711322fd292864bf6f1343638 (diff)
parent159f12e3350f0986e57a1b86017d8f189f43fef9 (diff)
downloadcpython-63cd0aa5696f9e8220e615369324272136b8ca2e.zip
cpython-63cd0aa5696f9e8220e615369324272136b8ca2e.tar.gz
cpython-63cd0aa5696f9e8220e615369324272136b8ca2e.tar.bz2
#16549: merge with 3.3.
Diffstat (limited to 'Lib/test/json_tests')
-rw-r--r--Lib/test/json_tests/test_tool.py4
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):