Skip to content

backport: v0.26 bitcoin#27895, bitcoin#28028 - #49

Closed
thepastaclaw wants to merge 2 commits into
developfrom
backport-0.26-b022-test-functional
Closed

thepastaclaw wants to merge 2 commits into
developfrom
backport-0.26-b022-test-functional

Conversation

@thepastaclaw

@thepastaclaw thepastaclaw commented Sep 15, 2026 •

Copy link
Copy Markdown
Owner

Automated Bitcoin Core v0.26 backports, batch backport-0.26-b022-test-functional.

upstream commit gates notes
bitcoin#27895 2097c66585 pick:pass build:pass tests:warn mech:pass verify:pass clean cherry-pick
bitcoin#28028 94d1b3bfc8 pick:pass build:pass tests:pass mech:pass verify:pass ci_fork:fail clean cherry-pick
Provenance

Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.

6779e6e test: clean up is node stopped (dimitaracev)

Pull request description:

  Fixes bitcoin#27893

  Use f'strings for the message when asserting `expected_ret_code` and `return_code`. Change the `expected_ret_code` from an optional to have a default value of `0`.

  cc MarcoFalke

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 6779e6e
  stickies-v:
    ACK 6779e6e
  brunoerg:
    ACK 6779e6e

Tree-SHA512: af84e7ffe467ced29236dee9206687786a2efb89ab8b039c3ebfb93ea23fc273206cd51f20c9fb6bee4135770e9a649538942571d9c0be83ba9535fa8e59cb28
faf9028 test: Check expected_stderr after stop (MarcoFalke)

Pull request description:

  This fixes a bug where stderr wasn't checked for the shutdown sequence.

  Fix that by waiting for the shutdown to finish and then check stderr.

ACKs for top commit:
  theStack:
    ACK faf9028

Tree-SHA512: a70cd1e6cda84d542782e41e8b59741dbcd472c0d0575bcef5cbfd1418473ce94efe921481d557bae3fbbdd78f1c49c09c48872883c052d87c5c9a9a51492692
@thepastaclaw

Copy link
Copy Markdown
Owner Author

The linux64_multiprocess build failure is unrelated to this PR. It fails compiling net_processing.cpp because dashbls/privatekey.hpp cannot find generated relic_conf.h; this PR only changes functional test files (feature_abortnode.py and test_node.py), and other Linux build variants passed in the same run. Leaving the branch unchanged; maintainers may rerun CI if needed.

@thepastaclaw

Copy link
Copy Markdown
Owner Author

CI failed at 94d1b3b on thepastaclaw/dash: linux64_multiprocess-test / Test source, linux64_tsan-test / Test source, linux64_sqlite-test / Test source, linux

The quoted log contains no test failure, only artifact upload and container cleanup, and the multiprocess job fails in a dashbls/relic build step that functional-test-only commits cannot affect. I verified every Dash call site of wait_until_stopped/is_node_stopped/stop_node is compatible with the new keyword-only signatures and that the new expected_stderr assert is never tripped, so I see no defect in the backport to fix.


🤖 backportsys, on behalf of the Dash backport pipeline.

@thepastaclaw

Copy link
Copy Markdown
Owner Author

CI failed at 94d1b3b on thepastaclaw/dash: linux64_asan-test / Test source, linux64_nowallet-test / Test source

Same as the other CI finding: the excerpt ends at artifact upload and post-job cleanup with no failing test named, and the asan job even ran against the develop-tagged CI image. Both commits are byte-faithful ports of 6779e6e and faf9028 with no dropped Dash lines, so there is nothing in the backport to correct here.


🤖 backportsys, on behalf of the Dash backport pipeline.

@thepastaclaw

Copy link
Copy Markdown
Owner Author

The linux64_multiprocess build failure is unrelated to this PR. It fails compiling net_processing.cpp because dashbls/privatekey.hpp cannot find generated relic

I agree with this assessment: the branch touches only test/functional/feature_abortnode.py and test/functional/test_framework/test_node.py, which cannot cause a net_processing.cpp compile failure from a missing generated relic_conf.h. No change made.


🤖 backportsys, on behalf of the Dash backport pipeline.

@thepastaclaw

thepastaclaw commented Sep 15, 2026 •

Copy link
Copy Markdown
Owner Author

🕓 Queued for automated review — 13th in line, estimated start in ~5 h (commit 94d1b3b)
Estimated review time once started: ~50 min (two-phase automated review; median of recent runs).

  • Request priority review — click to move this review to the front of the queue.

@thepastaclaw

Copy link
Copy Markdown
Owner Author

This comment is an automated review-queue status notice (position in line and ETA) with a priority-review checkbox; it reports no defect in the backported commits and requires no code change.


🤖 backportsys, on behalf of the Dash backport pipeline.

@DCG-Claude

Copy link
Copy Markdown
Collaborator

every backport on this branch is either on develop already or could not be carried onto the current develop; nothing left to carry - bitcoin#27895: moved to easy batch backport-0.26-b077-easy - bitcoin#28028: moved to easy batch backport-0.26-b077-easy

@DCG-Claude DCG-Claude closed this Oct 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants