[Tests] Make combine_logs.py handle multi-line logs#14051
Merged
laanwj merged 2 commits intoAug 28, 2018
Conversation
combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those.
jnewbery
force-pushed
the
improve_multi_line_logs_in_combine_logs
branch
from
50452a3 to
995dd89
Compare
Member
|
I've fixed this once as well in the past but never got to submitting a PR
|
Member
|
Tried to test, but it doesn't work as expected: output of before: after: both before and after don't really make sense, or am I doing something wrong? |
Contributor
Author
|
@laanwj - your logs aren't using microseconds, although that should be set here: I wonder if you're using an ancient cache from before microseconds were being used. Can you delete the /test/cache directory and try again? I've added an extra commit that handles timestamps without microseconds. |
Member
huh I also remember doing that before, have a very strong deja-vu here :) will re-test, thanks! edit: works for me, both before and after removing cache |
laanwj
added a commit
that referenced
this pull request
Aug 28, 2018
16e288a test padding non micro timestamps (John Newbery) 995dd89 [Tests] Make combine_logs.py handle multi-line logs (John Newbery) Pull request description: combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those. Tree-SHA512: dbe2f3ecc7cfbc95ee4350e648d127538c79cb6555257d4aeec12fe3d159366742b68e90e620c8ed7219a44b973395c7e5929ba374fae115fbee25560db645f6
deadalnix
pushed a commit
to Bitcoin-ABC/bitcoin-abc
that referenced
this pull request
Jun 24, 2020
Summary: 16e288acdd61fa5fa5e39f3936fb50499f82c085 test padding non micro timestamps (John Newbery) 995dd89d884bda3fb5ca1885c5887d989cd2cad3 [Tests] Make combine_logs.py handle multi-line logs (John Newbery) Pull request description: combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those. Tree-SHA512: dbe2f3ecc7cfbc95ee4350e648d127538c79cb6555257d4aeec12fe3d159366742b68e90e620c8ed7219a44b973395c7e5929ba374fae115fbee25560db645f6 Backport of Core [[bitcoin/bitcoin#14051 | PR14051]] Test Plan: ``` test_runner.py --nocleanup rpc_rawtransaction ../test/functional/combine_logs.py ./test/tmp/test_runner.../rpc_rawtransaction.../ > log-X ``` Run the above both pre- and post-patch such that `log-X` is `prepatch` or `postpatch` Compare `log-prepatch` and `log-postpatch`. Notice differences such as: Pre-patch: ``` node0 2020-06-22T17:16:52.793492Z [default wallet] CommitTransaction: CTransaction(txid=3ba5b944de, ver=2, vin.size=1, vout.size=2, nLockTime=102) CTxIn(COutPoint(14a7dbe849, 0), scriptSig=47304402205c13e050921aed, nSequence=4294967294) CTxOut(nValue=48.49999775, scriptPubKey=76a914cccfd89d94937ba12e3e5cd4) CTxOut(nValue=1.50000000, scriptPubKey=76a914385b721de9b99a792a500d8e) ``` Post-patch: ``` node0 2020-06-22T17:12:12.764276Z [default wallet] CommitTransaction: CTransaction(txid=d3b2f85905, ver=2, vin.size=1, vout.size=2, nLockTime=102) CTxIn(COutPoint(14a7dbe849, 0), scriptSig=47304402204a4cb54c886406, nSequence=4294967294) CTxOut(nValue=1.50000000, scriptPubKey=76a9148511074f89af479afce5ebbd) CTxOut(nValue=48.49999775, scriptPubKey=76a91440dd8375bebaa6eb331f6450) ``` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D6669
ftrader
pushed a commit
to bitcoin-cash-node/bitcoin-cash-node
that referenced
this pull request
Aug 17, 2020
Summary: 16e288acdd61fa5fa5e39f3936fb50499f82c085 test padding non micro timestamps (John Newbery) 995dd89d884bda3fb5ca1885c5887d989cd2cad3 [Tests] Make combine_logs.py handle multi-line logs (John Newbery) Pull request description: combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those. Tree-SHA512: dbe2f3ecc7cfbc95ee4350e648d127538c79cb6555257d4aeec12fe3d159366742b68e90e620c8ed7219a44b973395c7e5929ba374fae115fbee25560db645f6 Backport of Core [[bitcoin/bitcoin#14051 | PR14051]] Test Plan: ``` test_runner.py --nocleanup rpc_rawtransaction ../test/functional/combine_logs.py ./test/tmp/test_runner.../rpc_rawtransaction.../ > log-X ``` Run the above both pre- and post-patch such that `log-X` is `prepatch` or `postpatch` Compare `log-prepatch` and `log-postpatch`. Notice differences such as: Pre-patch: ``` node0 2020-06-22T17:16:52.793492Z [default wallet] CommitTransaction: CTransaction(txid=3ba5b944de, ver=2, vin.size=1, vout.size=2, nLockTime=102) CTxIn(COutPoint(14a7dbe849, 0), scriptSig=47304402205c13e050921aed, nSequence=4294967294) CTxOut(nValue=48.49999775, scriptPubKey=76a914cccfd89d94937ba12e3e5cd4) CTxOut(nValue=1.50000000, scriptPubKey=76a914385b721de9b99a792a500d8e) ``` Post-patch: ``` node0 2020-06-22T17:12:12.764276Z [default wallet] CommitTransaction: CTransaction(txid=d3b2f85905, ver=2, vin.size=1, vout.size=2, nLockTime=102) CTxIn(COutPoint(14a7dbe849, 0), scriptSig=47304402204a4cb54c886406, nSequence=4294967294) CTxOut(nValue=1.50000000, scriptPubKey=76a9148511074f89af479afce5ebbd) CTxOut(nValue=48.49999775, scriptPubKey=76a91440dd8375bebaa6eb331f6450) ``` Reviewers: #bitcoin_abc, Fabien Reviewed By: #bitcoin_abc, Fabien Differential Revision: https://reviews.bitcoinabc.org/D6669
PastaPastaPasta
pushed a commit
to PastaPastaPasta/dash
that referenced
this pull request
Jul 1, 2021
16e288a test padding non micro timestamps (John Newbery) 995dd89 [Tests] Make combine_logs.py handle multi-line logs (John Newbery) Pull request description: combine_logs.py currently inserts additional newlines into multi-line log messages, and doesn't color them properly. Fix both of those. Tree-SHA512: dbe2f3ecc7cfbc95ee4350e648d127538c79cb6555257d4aeec12fe3d159366742b68e90e620c8ed7219a44b973395c7e5929ba374fae115fbee25560db645f6
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.
3 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.
combine_logs.py currently inserts additional newlines into multi-line
log messages, and doesn't color them properly. Fix both of those.