From 110a1fd7271eb90448498302e2d95dab770513d6 Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Thu, 17 Sep 2015 20:04:34 +0200
Subject: enable zmq-test in rpc-tests.sh

---
 qa/pull-tester/rpc-tests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'qa')

diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
index b97d97b553..2f2b9d86db 100755
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -59,9 +59,9 @@ testScriptsExt=(
     'p2p-acceptblock.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}
-- 
cgit v1.2.3


From a9c27cdf55d5b5b7e07d189e5bfe2d6bc85867bb Mon Sep 17 00:00:00 2001
From: Jonas Schnelli <jonas.schnelli@include7.ch>
Date: Thu, 17 Sep 2015 16:32:00 +0200
Subject: [travis] add zmq python module

---
 qa/rpc-tests/zmq_test.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'qa')

diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index fffaf677d6..e949b61f5d 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)],
             [],
@@ -41,6 +39,8 @@ class ZMQTest (BitcoinTestFramework):
             []
             ])
 
+        return nodes
+
     def run_test(self):
         self.sync_all()
 
-- 
cgit v1.2.3


From 745f909925be419914083c66867150b11fa3a7b2 Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Tue, 29 Sep 2015 17:01:43 -0400
Subject: travis: install a recent libzmq and pyzmq for tests

---
 qa/rpc-tests/zmq_test.py | 2 --
 1 file changed, 2 deletions(-)

(limited to 'qa')

diff --git a/qa/rpc-tests/zmq_test.py b/qa/rpc-tests/zmq_test.py
index e949b61f5d..bcb132321a 100755
--- a/qa/rpc-tests/zmq_test.py
+++ b/qa/rpc-tests/zmq_test.py
@@ -39,8 +39,6 @@ class ZMQTest (BitcoinTestFramework):
             []
             ])
 
-        return nodes
-
     def run_test(self):
         self.sync_all()
 
-- 
cgit v1.2.3