aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJoão Barbosa <joao.paulo.barbosa@gmail.com>2017-09-06 16:36:13 +0100
committerMarcoFalke <falke.marco@gmail.com>2017-10-03 19:10:21 +0200
commit2b97b36e5d37c6935dce112f90213f4f49cd88ad (patch)
tree639ef57856c3572124ed2824ff258762c56e8af5 /test
parente38211f5e8900ee9027c671d7c655958e4dbe8e7 (diff)
downloadbitcoin-2b97b36e5d37c6935dce112f90213f4f49cd88ad.tar.xz
[test] Replace check_output with low level version
Github-Pull: #11125 Rebased-From: ce379b47b92d6c04250c21719bb1abfb41c586ad
Diffstat (limited to 'test')
-rwxr-xr-xtest/functional/test_framework/test_node.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/test/functional/test_framework/test_node.py b/test/functional/test_framework/test_node.py
index 363025740a..12dab57a02 100755
--- a/test/functional/test_framework/test_node.py
+++ b/test/functional/test_framework/test_node.py
@@ -181,5 +181,10 @@ class TestNodeCLI():
if named_args:
p_args += ["-named"]
p_args += [command] + pos_args + named_args
- cli_output = subprocess.check_output(p_args, input=self.input, universal_newlines=True)
- return json.loads(cli_output, parse_float=decimal.Decimal)
+ process = subprocess.Popen(p_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
+ cli_stdout, cli_stderr = process.communicate(input=self.input)
+ returncode = process.poll()
+ if returncode:
+ # Ignore cli_stdout, raise with cli_stderr
+ raise subprocess.CalledProcessError(returncode, self.binary, output=cli_stderr)
+ return json.loads(cli_stdout, parse_float=decimal.Decimal)