aboutsummaryrefslogtreecommitdiff
path: root/test/functional/rpc_zmq.py
diff options
context:
space:
mode:
authorJames O'Beirne <james.obeirne@gmail.com>2018-07-12 11:52:02 -0400
committerJames O'Beirne <james.obeirne@gmail.com>2018-07-12 13:08:35 -0400
commita0b604c1661811c31c78bfa8ab029c1fc88472a9 (patch)
tree25a226224b1aadb30b0674fa7bc72d8f232ca5b7 /test/functional/rpc_zmq.py
parentdcb154e5aad80e49ff41a7851604ac46f38cb167 (diff)
downloadbitcoin-a0b604c1661811c31c78bfa8ab029c1fc88472a9.tar.xz
[tests] skip rpc_zmq functional test when python3 zmq lib is not present
Also refactors zmq-related test skipping logic into distinct functions.
Diffstat (limited to 'test/functional/rpc_zmq.py')
-rwxr-xr-xtest/functional/rpc_zmq.py5
1 files changed, 4 insertions, 1 deletions
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):