diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-07-13 05:58:14 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-07-13 05:58:20 -0400 |
| commit | 2ea7eb62b21affeb56fcea7433cfff9e5bc4742c (patch) | |
| tree | 25a226224b1aadb30b0674fa7bc72d8f232ca5b7 /test/functional/rpc_zmq.py | |
| parent | dcb154e5aad80e49ff41a7851604ac46f38cb167 (diff) | |
| parent | a0b604c1661811c31c78bfa8ab029c1fc88472a9 (diff) | |
Merge #13645: [tests] skip rpc_zmq functional test as necessary
a0b604c166 [tests] skip rpc_zmq functional test when python3 zmq lib is not present (James O'Beirne)
Pull request description:
As noted in https://github.com/bitcoin/bitcoin/pull/13570/files#r201715904, the `rpc_zmq` functional test should be skipped when the `zmq` python3 package is not installed. This is breaking https://bitcoinperf.com benchmarks at the moment.
Tree-SHA512: ab519ae717f4b7a282640cf0389651723fdc108990aeb9852e8b9e96d61fa1ded2461717ae31558b37ff8401a5b1ccc41f4e858e402b8c3d98563d962599767a
Diffstat (limited to 'test/functional/rpc_zmq.py')
| -rwxr-xr-x | test/functional/rpc_zmq.py | 5 |
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): |