Test rpc_help.py failed: Check whether ZMQ is enabled or not.

Github-Pull: #14122
Rebased-From: 8dfc2f30de
This commit is contained in:
Kvaciral 2018-08-31 22:30:26 +02:00 committed by MarcoFalke
parent 24d796a6cc
commit 8bc1badada
2 changed files with 15 additions and 4 deletions

View file

@ -4,7 +4,7 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
"""Test RPC help output."""
from test_framework.test_framework import BitcoinTestFramework
from test_framework.test_framework import BitcoinTestFramework, is_zmq_enabled
from test_framework.util import assert_equal, assert_raises_rpc_error
class HelpRpcTest(BitcoinTestFramework):
@ -25,7 +25,13 @@ class HelpRpcTest(BitcoinTestFramework):
# command titles
titles = [line[3:-3] for line in node.help().splitlines() if line.startswith('==')]
assert_equal(titles, ['Blockchain', 'Control', 'Generating', 'Mining', 'Network', 'Rawtransactions', 'Util', 'Wallet', 'Zmq'])
components = ['Blockchain', 'Control', 'Generating', 'Mining', 'Network', 'Rawtransactions', 'Util', 'Wallet']
if is_zmq_enabled(self):
components.append('Zmq')
assert_equal(titles, components)
if __name__ == '__main__':
HelpRpcTest().main()

View file

@ -488,8 +488,13 @@ def skip_if_no_py3_zmq():
def skip_if_no_bitcoind_zmq(test_instance):
"""Skip the running test if bitcoind has not been compiled with zmq support."""
if not is_zmq_enabled(test_instance):
raise SkipTest("bitcoind has not been built with zmq enabled.")
def is_zmq_enabled(test_instance):
"""Checks whether zmq is enabled or not."""
config = configparser.ConfigParser()
config.read_file(open(test_instance.options.configfile))
if not config["components"].getboolean("ENABLE_ZMQ"):
raise SkipTest("bitcoind has not been built with zmq enabled.")
return config["components"].getboolean("ENABLE_ZMQ")