aboutsummaryrefslogtreecommitdiff
path: root/qa
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-05-09 15:11:41 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-05-09 15:11:50 +0200
commit409a8a1637d4941e5ebcc02a62fe2a8a46c91ced (patch)
treece411e057eaef9efe11e0865680fce00229ff9ef /qa
parenta68f56e727c3bd95fd9cd081da062dc1370175e0 (diff)
parent65fee8e699eb458291810e2d70cfa904d994fecf (diff)
downloadbitcoin-409a8a1637d4941e5ebcc02a62fe2a8a46c91ced.tar.xz
Merge #8030: test: Revert fatal-ness of missing python-zmq
65fee8e test: Revert fatal-ness of missing python-zmq (Wladimir J. van der Laan)
Diffstat (limited to 'qa')
-rwxr-xr-xqa/pull-tester/rpc-tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index 15153b7f58..01c2736e66 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -82,9 +82,9 @@ if ENABLE_ZMQ:
try:
import zmq
except ImportError as e:
- print("ERROR: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
+ print("WARNING: \"import zmq\" failed. Set ENABLE_ZMQ=0 or " \
"to run zmq tests, see dependency info in /qa/README.md.")
- raise e
+ ENABLE_ZMQ=0
#Tests
testScripts = [