From fac95398366f644911b58f1605e6bc37fb76782d Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 9 Sep 2018 13:32:37 -0400 Subject: qa: Run all tests even if wallet is not compiled --- test/functional/interface_zmq.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'test/functional/interface_zmq.py') diff --git a/test/functional/interface_zmq.py b/test/functional/interface_zmq.py index 745cc9e4fc..c853ba7e3f 100755 --- a/test/functional/interface_zmq.py +++ b/test/functional/interface_zmq.py @@ -5,15 +5,16 @@ """Test the ZMQ notification interface.""" import struct -from test_framework.test_framework import ( - BitcoinTestFramework, skip_if_no_bitcoind_zmq, skip_if_no_py3_zmq) +from test_framework.test_framework import BitcoinTestFramework from test_framework.messages import CTransaction -from test_framework.util import (assert_equal, - bytes_to_hex_str, - hash256, - ) +from test_framework.util import ( + assert_equal, + bytes_to_hex_str, + hash256, +) from io import BytesIO + class ZMQSubscriber: def __init__(self, socket, topic): self.sequence = 0 @@ -37,10 +38,12 @@ class ZMQTest (BitcoinTestFramework): def set_test_params(self): self.num_nodes = 2 - def setup_nodes(self): - skip_if_no_py3_zmq() - skip_if_no_bitcoind_zmq(self) + def skip_test_if_missing_module(self): + self.skip_if_no_py3_zmq() + self.skip_if_no_bitcoind_zmq() + self.skip_if_no_wallet() + def setup_nodes(self): # Import keys self.add_nodes(self.num_nodes) self.start_nodes() -- cgit v1.2.3