aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2016-05-09 12:08:56 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2016-05-09 12:12:09 +0200
commit65fee8e699eb458291810e2d70cfa904d994fecf (patch)
treebc367b160b5522f6223637e3e630ddae04e1e434
parente29cfc48fc08ce7317a43d51b861de0fc0c24006 (diff)
test: Revert fatal-ness of missing python-zmq
It looks like travis is using the `travis.yml` from the branch, but runs the test script from the branch merged into master. This causes pull requests created before the QA tests python 3 transition to fail. This temporarily reverts fa05e22e919b7e2e816606f0c0d3dea1bd325bfd (#7851). It can be restored when this is no longer an issue.
-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 = [