Skip to content

Conversation

@jnewbery
Copy link
Contributor

This commit uses the new skip test funcationality added in
232b666 to skip the zmq tests if the
python zmq module is not available or if bitcoind has been built without
zmq support.

This removes the zmq-specific logic from test_runner.py. In general it's
better if test_runner.py has no knowledge of special cases for
individual tests and is a general purpose test runner.

@maflcko
Copy link
Member

maflcko commented Mar 27, 2017 via email

@fanquake fanquake added the Tests label Mar 28, 2017
@fanquake
Copy link
Member

fanquake commented Apr 2, 2017

Needs a rebase. Will test.

@jmcorgan
Copy link
Contributor

utACK

@jnewbery
Copy link
Contributor Author

rebased

This commit uses the new skip test funcationality added in
232b666 to skip the zmq tests if the
python zmq module is not available or if bitcoind has been built without
zmq support.

This removes the zmq-specific logic from test_runner.py. In general it's
better if test_runner.py has no knowledge of special cases for
individual tests and is a general purpose test runner.
@jnewbery
Copy link
Contributor Author

rebased

Copy link
Contributor

@jimmysong jimmysong left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 6803e09

Tested with pyzmq not installed (skipped as expected)
Tested with zmq not enabled in binary (skipped as expected)
Tested with zmq and pyzmq enabled (tested as expected)

@maflcko
Copy link
Member

maflcko commented Apr 23, 2017

utACK 6803e09

@jimmysong Thanks for testing.

@maflcko maflcko merged commit 6803e09 into bitcoin:master Apr 23, 2017
maflcko pushed a commit that referenced this pull request Apr 23, 2017
6803e09 Move zmq test skipping logic into individual test case. (John Newbery)

Tree-SHA512: 9d166b53e9acf386c4dafc860b38e2901b331a7505bba9714a2f4e3bdef68b0316c8b76fddbfb620835ddee549cf32fffb3a96a19b0799ad94f2553f55f19a35
@jnewbery jnewbery deleted the zmq_optional branch April 25, 2017 13:12
PastaPastaPasta pushed a commit to PastaPastaPasta/dash that referenced this pull request Jun 8, 2019
…t case.

6803e09 Move zmq test skipping logic into individual test case. (John Newbery)

Tree-SHA512: 9d166b53e9acf386c4dafc860b38e2901b331a7505bba9714a2f4e3bdef68b0316c8b76fddbfb620835ddee549cf32fffb3a96a19b0799ad94f2553f55f19a35

s/bitcoind/dashd/

Signed-off-by: Pasta <[email protected]>
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants