Skip to content

pytest: check test_gossip_throttle's throttling in the log, not by a 3s floor #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kwsantiago merged 2 commits into from
Oct 18, 2026
Merged

pytest: check test_gossip_throttle's throttling in the log, not by a 3s floor #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17e727b
pytest: check test_gossip_throttle's throttling in the log, not by a …
kwsantiago Oct 17, 2026
469349a
pytest: match test_gossip_throttle's throttle by gossipwith's id, eit…
kwsantiago Oct 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions tests/test_gossip.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2168,6 +2168,10 @@ def test_dump_own_gossip(node_factory):
assert expect == []


# devtools/gossipwith's node id, from its default secret.
GOSSIPWITH_ID = '0324653eac434488002cc06bbfb7f10fe18991e35f9fe4302dbea6d2353dc0ab1c'


def test_gossip_throttle(node_factory, bitcoind, chainparams):
"""Make some gossip, test it gets throttled"""
l1, l2, l3, l4 = node_factory.line_graph(4, wait_for_announce=True,
Expand Down Expand Up @@ -2205,7 +2209,13 @@ def test_gossip_throttle(node_factory, bitcoind, chainparams):
check=True,
timeout=TIMEOUT, stdout=subprocess.PIPE).stdout.split()
time_slow = time.time() - start_slow
assert time_slow > 3
# A throttle waits at least a second; how many it takes depends on
# message sizes and the random flush delay, so check the log for it.
# It is logged once per connection, with whichever of traffic or CPU
# went over first. gossipwith always uses the same key, so its id
# tells its throttles from l3's.
assert time_slow > 1
l4.daemon.wait_for_log(r'Throttling outgoing peer {}: too much'.format(GOSSIPWITH_ID))

# Contents should be identical (once uniquified, since each
# doubles-up on its own gossip)
Expand Down Expand Up @@ -2257,7 +2267,8 @@ def test_gossip_throttle(node_factory, bitcoind, chainparams):
check=True,
timeout=TIMEOUT, stdout=subprocess.PIPE).stdout.split()
time_slow = time.time() - start_slow
assert time_slow > 3
assert time_slow > 1
l4.daemon.wait_for_log(r'Throttling outgoing peer {}: too much'.format(GOSSIPWITH_ID))
assert set(out2) == set(out4)


Expand Down
Loading