Improve TestNodeCLI output parsing

Parse JSONRPCException errors, and avoid JSON decode exception if RPC method
returns a plain string.

Author: ryanofsky

test/functional/test_framework/test_node.py

@@ -10,6 +10,7 @@
 import json
 import logging
 import os
+import re
 import subprocess
 import time
 
@@ -22,6 +23,9 @@
     p2p_port,
 )
 
+# For Python 3.4 compatibility
+JSONDecodeError = getattr(json, "JSONDecodeError", ValueError)
+
 BITCOIND_PROC_WAIT_TIMEOUT = 60
 
 class TestNode():
@@ -222,6 +226,13 @@ def send_cli(self, command, *args, **kwargs):
         cli_stdout, cli_stderr = process.communicate(input=self.input)
         returncode = process.poll()
         if returncode:
+            match = re.match(r'error code: ([-0-9]+)\nerror message:\n(.*)', cli_stderr)
+            if match:
+                code, message = match.groups()
+                raise JSONRPCException(dict(code=int(code), message=message))
             # 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)
+        try:
+            return json.loads(cli_stdout, parse_float=decimal.Decimal)
+        except JSONDecodeError:
+            return cli_stdout.rstrip("\n")