[28.x] rc backports #30762

pull fanquake wants to merge 4 commits into bitcoin:28.x from fanquake:28_x_backports changing 4 files +21 −4

fanquake commented at 10:17 AM on August 30, 2024: member
Backports:

test: fix `TestShell` initialization (late follow-up for #30463)

Github-Pull: #30714
Rebased-From: bd7ce05f9d9d21903163a2bd9dd2df3ed3990c3e

5577d5a3c0

fanquake added this to the milestone 28.0 on Aug 30, 2024
DrahtBot commented at 10:17 AM on August 30, 2024: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Code Coverage

For detailed information about the code coverage, see the test coverage report.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK stickies-v, willcl-ark, achow101

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
DrahtBot added the label Backport on Aug 30, 2024
DrahtBot added the label CI failed on Aug 30, 2024
test: Avoid intermittent timeout in p2p_headers_sync_with_minchainwork.py
Github-Pull: #30761 Rebased-From: fa247e6e8c7fddf9e3461c3e2e6f5fade0fe64cf
342baabaff
DrahtBot removed the label CI failed on Sep 3, 2024

Type	Reviewers
ACK	stickies-v, willcl-ark, achow101

test: fixing failing system_tests/run_command under some Locales

the run_command test under system_tests fails if the locale is anything
other than English ones because results such as "No such file or directory"
will be different under Non-English locales.

On the old version, a `ls nonexistingfile` was used to generate the error
output which is not ideal. In the current version we are using a Python one-liner
to generate a non 0 zero return value and "err" on stderr and check the
expected value against this.

fixes #30608

Github-Pull: #30788
Rebased-From: ae48a22a3df086fb59843b7b814619ed5df7557b

199bb09d88

depends: build libevent with -D_GNU_SOURCE

Currently, builds of libevent in depends, using CMake, fail on some
systems, like Alpine, with the following:
```bash
/bitcoin/depends/work/build/aarch64-unknown-linux-musl/libevent/2.1.12-stable-1516ed47ea8/evmap.c: In function 'evmap_signal_add_':
/bitcoin/depends/work/build/aarch64-unknown-linux-musl/libevent/2.1.12-stable-1516ed47ea8/evmap.c:456:31: error: 'NSIG' undeclared (first use in this function)
  456 |         if (sig < 0 || sig >= NSIG)
```

From what I can tell the `_GNU_SOURCE` "detection" in libevents CMake build
system, never? really worked, and it's not clear what a nice fix is.

For now, always use `_GNU_SOURCE` when building libevent in depends.

Github-Pull: #30743
Rebased-From: 556775408797d8e27154c3edaf139820b0979cce

b2a137929a

fanquake marked this as ready for review on Sep 5, 2024
DrahtBot added the label CI failed on Sep 5, 2024
stickies-v approved
stickies-v commented at 1:50 PM on September 5, 2024: contributor

ACK b2a137929a20baed161988e24de592b1f59c0096

Verified that all backports are clean. Didn't review changes in detail but they seem sensible.

willcl-ark commented at 8:59 PM on September 5, 2024: member

ACK b2a137929a20baed161988e24de592b1f59c0096

Backports all look good to me too. I saw two (spurious) functional test errors, but these went away on individual runs and aren't related to these backports:

<details> <summary>feature_minchainwork.py</summary>

255/310 - feature_minchainwork.py failed, Duration: 11 s

stdout:
2024-09-05T15:40:42.055000Z TestFramework (INFO): PRNG seed is: 2091274345751474524
2024-09-05T15:40:42.056000Z TestFramework (INFO): Initializing test directory /tmp/test_runner_₿_🏃_20240905_163627/feature_minchainwork_73
2024-09-05T15:40:42.792000Z TestFramework (INFO): Testing relay across node 1 (minChainWork = 101)
2024-09-05T15:40:42.793000Z TestFramework (INFO): Generating 49 blocks on node0
2024-09-05T15:40:42.888000Z TestFramework (INFO): Node0 current chain work: 0000000000000000000000000000000000000000000000000000000000000064
2024-09-05T15:40:45.889000Z TestFramework (INFO): Verifying node 2 has no more blocks than before
2024-09-05T15:40:45.891000Z TestFramework (INFO): Blockcounts: [49, 0, 0]
2024-09-05T15:40:45.893000Z TestFramework (INFO): Check that getheaders requests to node2 are ignored
2024-09-05T15:40:51.049000Z TestFramework (INFO): Generating one more block
2024-09-05T15:40:52.075000Z TestFramework (INFO): Verifying nodes are all synced
2024-09-05T15:40:52.081000Z TestFramework (INFO): Blockcounts: [50, 50, 50]
2024-09-05T15:40:52.081000Z TestFramework (INFO): Test that getheaders requests to node2 are not ignored
2024-09-05T15:40:52.133000Z TestFramework (INFO): Test -minimumchainwork with a non-hex value
2024-09-05T15:40:52.295000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/home/will/src/bitcoin/test/functional/test_framework/test_framework.py", line 132, in main
    self.run_test()
  File "/home/will/src/bitcoin/test/functional/feature_minchainwork.py", line 111, in run_test
    self.nodes[0].assert_start_raises_init_error(
  File "/home/will/src/bitcoin/test/functional/test_framework/test_node.py", line 684, in assert_start_raises_init_error
    self._raise_assertion_error(
  File "/home/will/src/bitcoin/test/functional/test_framework/test_node.py", line 197, in _raise_assertion_error
    raise AssertionError(self._node_msg(msg))
AssertionError: [node 0] Expected message "Error: Invalid non-hex (test) minimum chain work value specified" does not fully match stderr:
"Error: Invalid minimum work specified (test), must be up to 64 hex digits"
2024-09-05T15:40:52.346000Z TestFramework (INFO): Stopping nodes
2024-09-05T15:40:52.550000Z TestFramework (WARNING): Not cleaning up dir /tmp/test_runner_₿_🏃_20240905_163627/feature_minchainwork_73
2024-09-05T15:40:52.550000Z TestFramework (ERROR): Test failed. Test logging available at /tmp/test_runner_₿_🏃_20240905_163627/feature_minchainwork_73/test_framework.log
2024-09-05T15:40:52.550000Z TestFramework (ERROR):
2024-09-05T15:40:52.550000Z TestFramework (ERROR): Hint: Call /home/will/src/bitcoin/test/functional/combine_logs.py '/tmp/test_runner_₿_🏃_20240905_163627/feature_minchainwork_73' to consolidate all logs
2024-09-05T15:40:52.550000Z TestFramework (ERROR):
2024-09-05T15:40:52.550000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-09-05T15:40:52.550000Z TestFramework (ERROR): https://github.com/bitcoin/bitcoin/issues
2024-09-05T15:40:52.550000Z TestFramework (ERROR):


stderr:

</details>

296/310 - rpc_help.py failed, Duration: 1 s

stdout:
2024-09-05T15:41:15.692000Z TestFramework (INFO): PRNG seed is: 7537918462783619708
2024-09-05T15:41:15.693000Z TestFramework (INFO): Initializing test directory /tmp/test_runner_₿_🏃_20240905_163627/rpc_help_7
2024-09-05T15:41:16.034000Z TestFramework (ERROR): Assertion failed
Traceback (most recent call last):
  File "/home/will/src/bitcoin/test/functional/test_framework/test_framework.py", line 132, in main
    self.run_test()
  File "/home/will/src/bitcoin/test/functional/rpc_help.py", line 54, in run_test
    self.test_client_conversion_table()
  File "/home/will/src/bitcoin/test/functional/rpc_help.py", line 72, in test_client_conversion_table
    raise AssertionError("RPC client conversion table ({}) and RPC server named arguments mismatch!\n{}".format(
AssertionError: RPC client conversion table (/home/will/src/bitcoin/src/rpc/client.cpp) and RPC server named arguments mismatch!
{('fundrawtransaction', 1, 'max_excess'), ('send', 4, 'max_excess'), ('walletcreatefundedpsbt', 3, 'max_excess'), ('fundrawtransaction', 1, 'add_excess_to_recipient_position'), ('send', 4, 'add_excess_to_recipient_position'), ('walletcreatefundedpsbt', 3, 'add_excess_to_recipient_position')}
2024-09-05T15:41:16.085000Z TestFramework (INFO): Stopping nodes
2024-09-05T15:41:16.287000Z TestFramework (WARNING): Not cleaning up dir /tmp/test_runner_₿_🏃_20240905_163627/rpc_help_7
2024-09-05T15:41:16.287000Z TestFramework (ERROR): Test failed. Test logging available at /tmp/test_runner_₿_🏃_20240905_163627/rpc_help_7/test_framework.log
2024-09-05T15:41:16.287000Z TestFramework (ERROR):
2024-09-05T15:41:16.287000Z TestFramework (ERROR): Hint: Call /home/will/src/bitcoin/test/functional/combine_logs.py '/tmp/test_runner_₿_🏃_20240905_163627/rpc_help_7' to consolidate all logs
2024-09-05T15:41:16.287000Z TestFramework (ERROR):
2024-09-05T15:41:16.287000Z TestFramework (ERROR): If this failure happened unexpectedly or intermittently, please file a bug and provide a link or upload of the combined log.
2024-09-05T15:41:16.287000Z TestFramework (ERROR): https://github.com/bitcoin/bitcoin/issues
2024-09-05T15:41:16.287000Z TestFramework (ERROR):


stderr:

</details>

achow101 commented at 10:22 PM on September 5, 2024: member

ACK b2a137929a20baed161988e24de592b1f59c0096
achow101 merged this on Sep 5, 2024
achow101 closed this on Sep 5, 2024
fanquake deleted the branch on Sep 6, 2024
bitcoin locked this on Sep 6, 2025

Contributors

Labels

Milestone
28.0

Linked (view graph)

#30714 test: fix `TestShell` initialization (late follow-up for #30463)#30743 depends: build libevent with `-D_GNU_SOURCE`#30761 test: Avoid intermittent timeout in p2p_headers_sync_with_minchainwork.py #30788 test: fixing failing system_tests/run_command under some Locales

[28.x] rc backports #30762

Code Coverage

Reviews