Commit graph

24 commits

Author SHA1 Message Date
Andrew Poelstra
1b7df1d514 Merge 95ca6aeec7 into merged_master (Bitcoin PR #17691) 2020-11-14 16:52:08 +00:00
Andrew Poelstra
14a79b024a Merge d5a770b70d into merged_master (Bitcoin PR #16973) 2020-11-09 21:20:37 +00:00
Andrew Poelstra
eb174d36e9 Merge 45be44cce4 into merged_master (Bitcoin PR #15257) 2020-11-09 21:20:21 +00:00
Andrew Poelstra
a93a689a14 Merge d5ea8f4bf3 into merged_master (Bitcoin PR #16509) 2020-11-09 21:20:12 +00:00
Andrew Poelstra
795fb97df2 Merge 86edb79e97 into merged_master (Bitcoin PR #15841) 2020-10-29 02:07:03 +00:00
Hennadii Stepanov
fac86ac7b3
scripted-diff: Add missed copyright headers
-BEGIN VERIFY SCRIPT-
s() { contrib/devtools/copyright_header.py insert "$1"; }

s build_msvc/bitcoin_config.h
s build_msvc/msvc-autogen.py
s build_msvc/testconsensus/testconsensus.cpp
s contrib/devtools/circular-dependencies.py
s contrib/devtools/gen-manpages.sh
s contrib/filter-lcov.py
s contrib/gitian-build.py
s contrib/install_db4.sh
s src/crypto/sha256_avx2.cpp
s src/crypto/sha256_sse41.cpp
s src/fs.cpp
s src/qt/test/addressbooktests.cpp
s src/qt/test/addressbooktests.h
s src/qt/test/util.cpp
s src/qt/test/util.h
s src/qt/test/wallettests.cpp
s src/qt/test/wallettests.h
s src/test/blockchain_tests.cpp
s test/functional/combine_logs.py
s test/lint/lint-locale-dependence.sh
sed -i '1G' test/lint/lint-shebang.sh
s test/lint/lint-shebang.sh
-END VERIFY SCRIPT-
2020-01-04 20:18:28 +02:00
Martin Zumsande
d478a472eb test: Fix combine_logs.py for AppVeyor build 2019-09-27 12:40:20 +02:00
Ben Woosley
b21680baf5
test/contrib: Fix invalid escapes in regex strings
Flagged by flake8 v3.6.0, as W605, plus a few others identified
incidentally, e.g. 59ffecf66cf4d08c4b431e457b083878d66a3fd6.

Note that r"\n" matches to "\n" under re.match/search.
2019-09-03 14:38:38 -04:00
MarcoFalke
faf36838bd
test: Avoid hardcoding the chain name in combine_logs 2019-08-02 09:04:21 -04:00
Steven Roose
f4889a5253
UPSTREAM MERGE BROKEN: Merge upstream commit '519b0bc5dc' into master 2019-05-17 16:17:09 +01:00
Steven Roose
1a2a93a5ff
MERGE-FIX: General fixes for functional tests 2019-05-14 15:09:19 +01:00
Steven Roose
7f894ae00b
UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master 2019-05-01 19:18:18 +01:00
MarcoFalke
fa90a89eee
[test] combine_logs: append node stderr and stdout if it exists 2019-04-17 17:11:55 -04:00
Gregory Sanders
c62fab2d69 UPSTREAM MERGE BROKEN: Merge commit '3832c25f17' into merge_14225 2019-01-28 18:14:25 +00:00
James O'Beirne
4aabadbf44 tests: have combine_logs default to most recent test dir 2018-11-29 17:41:12 -05:00
Jorge Timón
a1e0c56a55
QA: Use resgtest2 chain instead of regtest for rpc tests 2018-10-16 18:32:20 +02:00
Jorge Timón
4454c52ae6
QA: Adapt BitcoinTestFramework for chains other than "regtest" 2018-10-16 18:32:19 +02:00
Chun Kuan Lee
2148c36b6e tests: Make it possible to run functional tests on Windows 2018-09-17 09:56:49 +08:00
John Newbery
16e288acdd test padding non micro timestamps 2018-08-27 14:31:44 -04:00
John Newbery
995dd89d88 [Tests] Make combine_logs.py handle multi-line logs
combine_logs.py currently inserts additional newlines into multi-line
log messages, and doesn't color them properly. Fix both of those.
2018-08-24 11:55:05 -04:00
MarcoFalke
fa8071a098
qa: Log as utf-8 2018-06-11 16:22:46 -04:00
practicalswift
a7324bd799 Format timestamps using ISO 8601 formatting (e.g. "2018-02-28T12:34:56Z")
* Z is the zone designator for the zero UTC offset.
* T is the delimiter used to separate date and time.

This makes it clear for the end-user that the date/time logged is
specified in UTC and not in the local time zone.
2018-03-09 15:02:01 +01:00
MarcoFalke
fa4535df57 [qa] combine_logs: Use ordered list for logfiles 2017-03-27 11:26:31 +02:00
John Newbery
61d75f587d Introduce combine_logs.py to combine log files from multiple bitcoinds.
This commit adds a tool for combining log files from multiple instances
of bitcoinds as well as the test_framework.log file. This gives a
combined view of what the test framework and all bitcoin instances were
doing during a qa test.
2017-03-21 17:30:13 -04:00