diff options
| author | Ava Chow <github@achow101.com> | 2024-09-05 18:29:25 -0400 |
|---|---|---|
| committer | Ava Chow <github@achow101.com> | 2024-09-05 18:29:25 -0400 |
| commit | fa460884406b35b0dee75af23f42e8b4c4acbebc (patch) | |
| tree | 1415822945c0f7370da2639fc268f2fc9bbd0c9e /src | |
| parent | 88f0419c1ab1e5f3ccf425435e530d8ceb72c7f1 (diff) | |
| parent | b2a137929a20baed161988e24de592b1f59c0096 (diff) | |
Merge bitcoin/bitcoin#30762: [28.x] rc backports
b2a137929a20baed161988e24de592b1f59c0096 depends: build libevent with -D_GNU_SOURCE (fanquake)
199bb09d88e28d951c5068eb65643390dbedd066 test: fixing failing system_tests/run_command under some Locales (Jadi)
342baabaffc385dc44a44f6d8cf32728a25a0356 test: Avoid intermittent timeout in p2p_headers_sync_with_minchainwork.py (MarcoFalke)
5577d5a3c0904a4805e7b768cb60144daa2a0854 test: fix `TestShell` initialization (late follow-up for #30463) (Sebastian Falbesoner)
Pull request description:
Backports:
* https://github.com/bitcoin/bitcoin/pull/30714
* https://github.com/bitcoin/bitcoin/pull/30743
* https://github.com/bitcoin/bitcoin/pull/30761
* https://github.com/bitcoin/bitcoin/pull/30788
ACKs for top commit:
willcl-ark:
ACK b2a137929a20baed161988e24de592b1f59c0096
achow101:
ACK b2a137929a20baed161988e24de592b1f59c0096
stickies-v:
ACK b2a137929a20baed161988e24de592b1f59c0096
Tree-SHA512: bf08ac0c613395def974a1b287345d4a64edc066c14f8c9f0184478b0e33e48333760eeb6e96b6b5fbafbb21b40d01875e3f526213a2734e226b2e111d71f3a3
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/system_tests.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/system_tests.cpp b/src/test/system_tests.cpp index baa759e42c..07d15f5552 100644 --- a/src/test/system_tests.cpp +++ b/src/test/system_tests.cpp @@ -54,8 +54,8 @@ BOOST_AUTO_TEST_CASE(run_command) } { // Return non-zero exit code, with error message for stderr - const std::string command{"ls nosuchfile"}; - const std::string expected{"No such file or directory"}; + const std::string command{"python3 -c 'import sys; print(\"err\", file=sys.stderr); sys.exit(2)'"}; + const std::string expected{"err"}; BOOST_CHECK_EXCEPTION(RunCommandParseJSON(command), std::runtime_error, [&](const std::runtime_error& e) { const std::string what(e.what()); BOOST_CHECK(what.find(strprintf("RunCommandParseJSON error: process(%s) returned", command)) != std::string::npos); |