From a0b604c1661811c31c78bfa8ab029c1fc88472a9 Mon Sep 17 00:00:00 2001 From: James O'Beirne Date: Thu, 12 Jul 2018 11:52:02 -0400 Subject: [tests] skip rpc_zmq functional test when python3 zmq lib is not present Also refactors zmq-related test skipping logic into distinct functions. --- test/functional/rpc_zmq.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'test/functional/rpc_zmq.py') diff --git a/test/functional/rpc_zmq.py b/test/functional/rpc_zmq.py index eb789face2..6dbc726d5e 100755 --- a/test/functional/rpc_zmq.py +++ b/test/functional/rpc_zmq.py @@ -4,7 +4,8 @@ # file COPYING or http://www.opensource.org/licenses/mit-license.php. """Test for the ZMQ RPC methods.""" -from test_framework.test_framework import BitcoinTestFramework +from test_framework.test_framework import ( + BitcoinTestFramework, skip_if_no_py3_zmq, skip_if_no_bitcoind_zmq) from test_framework.util import assert_equal @@ -17,6 +18,8 @@ class RPCZMQTest(BitcoinTestFramework): self.setup_clean_chain = True def run_test(self): + skip_if_no_py3_zmq() + skip_if_no_bitcoind_zmq(self) self._test_getzmqnotifications() def _test_getzmqnotifications(self): -- cgit v1.2.3