[tests] fixups from set_test_params()#11215
Merged
sipa merged 1 commit intobitcoin:masterfrom Sep 1, 2017
Merged
Conversation
Contributor
|
ACK 3918d93, obviously this should be merged asap 👍 |
Contributor
|
utACK 3918d93. |
Member
|
ACK 3918d93, this fixes tests for me |
sipa
added a commit
that referenced
this pull request
Sep 1, 2017
3918d93 [tests] fixups from set_test_params() (John Newbery) Pull request description: #11121 had a silent merge conflict in `bitcoin_cli.py`. This fixes it. Also fixes a comment in `example_test.py` Tree-SHA512: f22a645c51c9aeda005526338ad6f2ee07f2bab172847fc54f51fecf1c79e778970be61e5e637d4e0aba3a02e5aba0737b0b57f1bc11a514a1acd94c221b54d6
Member
|
Post merge utACK 3918d93. Thanks for the quick merge. |
maflcko
pushed a commit
to maflcko/bitcoin-core
that referenced
this pull request
Oct 3, 2017
Github-Pull: bitcoin#11215 Rebased-From: 3918d93
codablock
pushed a commit
to codablock/dash
that referenced
this pull request
Sep 24, 2019
3918d93 [tests] fixups from set_test_params() (John Newbery) Pull request description: bitcoin#11121 had a silent merge conflict in `bitcoin_cli.py`. This fixes it. Also fixes a comment in `example_test.py` Tree-SHA512: f22a645c51c9aeda005526338ad6f2ee07f2bab172847fc54f51fecf1c79e778970be61e5e637d4e0aba3a02e5aba0737b0b57f1bc11a514a1acd94c221b54d6
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
#11121 had a silent merge conflict in
bitcoin_cli.py. This fixes it.Also fixes a comment in
example_test.py