diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:12:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-01 16:22:26 +0200 |
| commit | 17d0e638b66b9dd51370335c9b0a7039de3f81fa (patch) | |
| tree | 5f23133631a574afda55dbad76e451d172856fd4 /qa | |
| parent | 4899a04c24b927166048a74999992d216a543c23 (diff) | |
| parent | 745f909925be419914083c66867150b11fa3a7b2 (diff) | |
| download | bitcoin-17d0e638b66b9dd51370335c9b0a7039de3f81fa.tar.xz | |
Merge pull request #6686
745f909 travis: install a recent libzmq and pyzmq for tests (Cory Fields)
a9c27cd [travis] add zmq python module (Jonas Schnelli)
110a1fd enable zmq-test in rpc-tests.sh (Jonas Schnelli)
Diffstat (limited to 'qa')
| -rwxr-xr-x | qa/pull-tester/rpc-tests.sh | 6 | ||||
| -rwxr-xr-x | qa/rpc-tests/zmq_test.py | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh index 2e8a7c69ce..7e1d2e8e50 100755 --- a/qa/pull-tester/rpc-tests.sh +++ b/qa/pull-tester/rpc-tests.sh @@ -60,9 +60,9 @@ testScriptsExt=( 'mempool_packages.py' ); -#if [ "x$ENABLE_ZMQ" = "x1" ]; then -# testScripts+=('zmq_test.py') -#fi +if [ "x$ENABLE_ZMQ" = "x1" ]; then + testScripts+=('zmq_test.py') +fi extArg="-extended" passOn=${@#$extArg} diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py index fffaf677d6..bcb132321a 100755 --- a/qa/rpc-tests/zmq_test.py +++ b/qa/rpc-tests/zmq_test.py @@ -32,8 +32,6 @@ class ZMQTest (BitcoinTestFramework): self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashblock") self.zmqSubSocket.setsockopt(zmq.SUBSCRIBE, "hashtx") self.zmqSubSocket.connect("tcp://127.0.0.1:%i" % self.port) - # Note: proxies are not used to connect to local nodes - # this is because the proxy to use is based on CService.GetNetwork(), which return NET_UNROUTABLE for localhost return start_nodes(4, self.options.tmpdir, extra_args=[ ['-zmqpubhashtx=tcp://127.0.0.1:'+str(self.port), '-zmqpubhashblock=tcp://127.0.0.1:'+str(self.port)], [], |