summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorDaniel Himmelstein <daniel.himmelstein@gmail.com>2017-03-15 14:31:06 (GMT)
committerBerker Peksag <berker.peksag@gmail.com>2017-03-15 14:31:06 (GMT)
commitb4e9087e7b77e8f76feac76f9c1ab21b49c0c766 (patch)
tree9925cc42cca79210c68eeeb28888416448941a1b /Lib
parent6c3d5274687c97f9c13800ad50e73e15b54f629d (diff)
downloadcpython-b4e9087e7b77e8f76feac76f9c1ab21b49c0c766.zip
cpython-b4e9087e7b77e8f76feac76f9c1ab21b49c0c766.tar.gz
cpython-b4e9087e7b77e8f76feac76f9c1ab21b49c0c766.tar.bz2
Fix stderr bug in json.tool test (#346)
See https://github.com/python/cpython/pull/201#discussion_r103229425.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_json/test_tool.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/Lib/test/test_json/test_tool.py b/Lib/test/test_json/test_tool.py
index 15f3736..9d93f93 100644
--- a/Lib/test/test_json/test_tool.py
+++ b/Lib/test/test_json/test_tool.py
@@ -2,7 +2,7 @@ import os
import sys
import textwrap
import unittest
-import subprocess
+from subprocess import Popen, PIPE
from test import support
from test.support.script_helper import assert_python_ok
@@ -61,12 +61,11 @@ class TestTool(unittest.TestCase):
""")
def test_stdin_stdout(self):
- with subprocess.Popen(
- (sys.executable, '-m', 'json.tool'),
- stdin=subprocess.PIPE, stdout=subprocess.PIPE) as proc:
+ args = sys.executable, '-m', 'json.tool'
+ with Popen(args, stdin=PIPE, stdout=PIPE, stderr=PIPE) as proc:
out, err = proc.communicate(self.data.encode())
self.assertEqual(out.splitlines(), self.expect.encode().splitlines())
- self.assertEqual(err, None)
+ self.assertEqual(err, b'')
def _create_infile(self):
infile = support.TESTFN