diff options
| author | Elliot Olds <elliotolds@gmail.com> | 2016-03-10 03:12:40 -0800 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-06-10 00:07:50 +0200 |
| commit | 697ed8c8279a1ac915b71db06a03f9ed85b9f334 (patch) | |
| tree | afccfcb1d0d94afac048b9e54cf3ccc79f32671b /qa | |
| parent | d5a9de352c1dd11085442e293e22edaf4b2d4839 (diff) | |
| download | bitcoin-697ed8c8279a1ac915b71db06a03f9ed85b9f334.tar.xz | |
Check if zmq is installed in tests, update docs
Github-Pull: #7635
Rebased-From: 2ab835ae6c02de14264896d571c0bba230a1e9f0
Diffstat (limited to 'qa')
| -rw-r--r-- | qa/README.md | 11 | ||||
| -rwxr-xr-x | qa/pull-tester/rpc-tests.py | 9 |
2 files changed, 20 insertions, 0 deletions
diff --git a/qa/README.md b/qa/README.md index 758d1f47e5..2b476c4d8d 100644 --- a/qa/README.md +++ b/qa/README.md @@ -5,6 +5,17 @@ Every pull request to the bitcoin repository is built and run through the regression test suite. You can also run all or only individual tests locally. +Test dependencies +================= +Before running the tests, the following must be installed. + +Unix +---- +The python-zmq library is required. On Ubuntu or Debian it can be installed via: +``` +sudo apt-get install python-zmq +``` + Running tests ============= diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py index 2f287a9265..56e19f5e38 100755 --- a/qa/pull-tester/rpc-tests.py +++ b/qa/pull-tester/rpc-tests.py @@ -40,6 +40,15 @@ if 'ENABLE_UTILS' not in vars(): ENABLE_UTILS=0 if 'ENABLE_ZMQ' not in vars(): ENABLE_ZMQ=0 + +# python-zmq may not be installed. Handle this gracefully and with some helpful info +if ENABLE_ZMQ: + try: + import zmq + except ImportError: + print("WARNING: \"import zmq\" failed. Setting ENABLE_ZMQ=0. " \ + "To run zmq tests, see dependency info in /qa/README.md.") + ENABLE_ZMQ=0 ENABLE_COVERAGE=0 |