test: fix intermittent failure in p2p_addr_selfannouncement #34204

pull 0xB10C wants to merge 1 commits into bitcoin:master from 0xB10C:2026-01-fix-addrselfanouncement-test changing 1 files +1 −1

0xB10C commented at 3:56 PM on January 5, 2026: contributor

Due to the mocktime being bumped before the expected time is updated, it could happen that the self-announcement is send with an newer timestamp than what we expect. To fix this, update the expected time before we bump the mocktime.

closes #34159

test: fix intermittent failure in p2p_addr_selfannouncement

Due to the mocktime being bumped before the expected time is updated,
it could happen that the self-announcement is send with an newer
timestamp than what we expect. To fix this, update the expected time
before we bump the mocktime.

closes #34159

31852057ea

DrahtBot added the label Tests on Jan 5, 2026
DrahtBot commented at 3:56 PM on January 5, 2026: contributor



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



Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/34204.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK bensig, maflcko, w0xlt, naiyoma

If your review is incorrectly listed, please copy-paste <code></code> into the comment that the bot should ignore.
0xB10C commented at 4:02 PM on January 5, 2026: contributor
I've been testing this with GHA runners by doing 500 instead of 5 extra self-annoucements in the test https://github.com/0xB10C/bitcoin/commit/592be7e13e1ef27b0e6804899d51b8db93521f5f:
- with the fix (all green): https://github.com/0xB10C/bitcoin/actions/runs/20712218919/attempts/1 and https://github.com/0xB10C/bitcoin/actions/runs/20712218919/attempts/2
- with the fix reverted again (failing): https://github.com/0xB10C/bitcoin/actions/runs/20715177023/attempts/1 and https://github.com/0xB10C/bitcoin/actions/runs/20715177023/attempts/2
will re-run these a couple of times
bensig commented at 6:16 PM on January 5, 2026: contributor

ACK 31852057ea393e64b7ea2bfabc75a55fda40b786

Tested on macOS - p2p_addr_selfannouncement.py passes.

The fix is sane - set expected time before bumping mocktime to avoid the race where self-announcement could be sent with a timestamp newer than expected.
maflcko commented at 7:34 AM on January 6, 2026: member

lgtm ACK 31852057ea393e64b7ea2bfabc75a55fda40b786
maflcko added this to the milestone 31.0 on Jan 6, 2026
w0xlt commented at 9:16 AM on January 6, 2026: contributor

ACK https://github.com/bitcoin/bitcoin/pull/34204/commits/31852057ea393e64b7ea2bfabc75a55fda40b786
naiyoma commented at 9:22 AM on January 6, 2026: contributor

utACK 31852057ea393e64b7ea2bfabc75a55fda40b786
fanquake merged this on Jan 6, 2026
fanquake closed this on Jan 6, 2026