Merge bitcoin PRs: #14683, #15841, #14984 and #15943#4514
Merge bitcoin PRs: #14683, #15841, #14984 and #15943#4514UdjinM6 merged 4 commits intodashpay:developfrom
Conversation
4aabadb tests: have combine_logs default to most recent test dir (James O'Beirne) Pull request description: Have `combine_logs.py` default to the most recent test directory if no argument is provided. This allows you to avoid an annoying copy-paste when iterating on a failing test, since you can do something like ```sh alias testlogs='./test/functional/combine_logs.py -c | less' ./test/functional/some_test.py # fails testlogs ``` Tree-SHA512: 919642ab09c314888a23c9491963b35b9da87e60deb740d1d5e816444aa9bdda5e519dc8ca131669f2d563167ef5f5abb14e22f20f47bf8362915ed578181846
…ut if it exists fa90a89 [test] combine_logs: append node stderr and stdout if it exists (MarcoFalke) Pull request description: See issue: * tests: bitcoind stdout and error should be passed to the logger bitcoin#13519 ACKs for commit fa90a8: laanwj: utACK fa90a89 Tree-SHA512: 39c4596e2e133c9011ab01bc4dc24e884d0a8cce7a67d3765f17c288d3ffbd438e1ff6016d0f817a981b27fce17fa77a1ff56787ddb1ea55123ce9ecffb44c08
2d5cf4c rpc: Speedup getrawmempool when verbose=true (João Barbosa) Pull request description: Instead of calling `pushKV(hash, info)`, which incurs in duplicate key checks, call `__pushKV` which (currently) doesn't. Improves RPC `getrawmempool` and REST `/rest/mempool/contents.json`. Fixes bitcoin#14765. ACKs for commit 2d5cf4: Tree-SHA512: c3e91371bb41f39e79dcef820815e1dc27fb689ca3c4bf3a00467d2215b3baecd44d9792f7a481577a5b7ae1fc6cbaa07b1cd62123b845082eba65b35c2b3ca5
fad0ce5 tests: Fail if RPC has been added without tests (MarcoFalke) Pull request description: Need to be run with --coverage ACKs for commit fad0ce: ryanofsky: utACK fad0ce5. New comment in travis.yml is the only change since last review. Tree-SHA512: b53632dfe9865ec06991bfcba2fd67238bebbb866b355f09624eaf233257b2bca902caac6c24abb358b2f4c1c43f28ca75e30982765911e1a117102df65276d9
|
A question about bitcoin#15943 - right now it doesn't exactly fail, rather, it prints out the list of RPCs that aren't covered with tests: These are mostly Dash-specific RPCs. |
PastaPastaPasta
left a comment
PastaPastaPasta
left a comment
There was a problem hiding this comment.
utACK for merging via merge commit, one nit
| TEST_EXIT_SKIPPED = 77 | ||
|
|
||
| GENESISTIME = 1417713337 | ||
| TMPDIR_PREFIX = "dash_func_test_" |
There was a problem hiding this comment.
14683 nit, should be a new-line after this
There was a problem hiding this comment.
There is already a newline here, and the original chunk in bitcoin#14683 doesn't have any new line after TMPDIR_PREFIX: https://github.com/bitcoin/bitcoin/pull/14683/files#diff-defba63b5060365ddb5ea30737e06bae40f15a743f437b6fff18dc15e9acc233R16-R22
Do you want me to add one between GENESISTIME and TMPDIR_PREFIX?
There was a problem hiding this comment.
No, there should be ANOTHER newline after TMPDIR_PREFIX :D If you look at the bitcoin PR, there is two new lines after the TMPDIR_PREFIX
There was a problem hiding this comment.
There is just one as far as I can tell... At line 23:
Not like I mind adding another one though - will do :)
There was a problem hiding this comment.
Oops, didn't realize the PR has already been merged in overnight. Anyways, hope that's not a big deal :-D
3 participants
No description provided.