Skip to content

tests: fix flaky test_bwatch_listwatch #9361

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
daywalker90 merged 1 commit into from
Jul 29, 2026
Merged

tests: fix flaky test_bwatch_listwatch #9361

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 13 additions & 7 deletions tests/test_plugin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5848,9 +5848,6 @@ def test_bwatch_listwatch(node_factory, bitcoind):
"""Test that listwatch RPC returns all active watches"""
l1 = node_factory.get_node(options=BWATCH_OPTS)

# Record the baseline — the wallet registers scriptpubkey watches on startup.
initial_count = len(l1.rpc.listwatch()['watches'])

# Add an outpoint watch — clearly not a real UTXO.
test_outpoint_a_txid = "a" * 64
test_outpoint_a = f"{test_outpoint_a_txid}:0"
Expand All @@ -5868,11 +5865,20 @@ def test_bwatch_listwatch(node_factory, bitcoind):
# Add a second owner to the first outpoint watch
l1.rpc.addoutpointwatch(owner='wallet/p2tr/0', outpoint=test_outpoint_a, start_block=50)

# The wallet registers its own scriptpubkey watches at startup, and on a
# slow machine that registration can land at any point during the test,
# so a total-count baseline races it. Count only this test's watches,
# which no background registration can perturb.
def our_watches(watches):
return [w for w in watches
if w.get('outpoint') in (test_outpoint_a, test_outpoint_c)
or w.get('scriptpubkey') == test_scriptpubkey]

result = l1.rpc.listwatch()
watches = result['watches']

# 3 new unique watches added on top of the wallet's initial set
assert len(watches) == initial_count + 3
# 3 unique watches: the two adds for the same outpoint merged into one
assert len(our_watches(watches)) == 3

# Find each test watch by its unique identifier
outpoint_a_watch = next((w for w in watches if w.get('outpoint') == test_outpoint_a), None)
Expand Down Expand Up @@ -5902,7 +5908,7 @@ def test_bwatch_listwatch(node_factory, bitcoind):
l1.rpc.deloutpointwatch(owner='wallet/p2wpkh/0', outpoint=test_outpoint_a)

watches = l1.rpc.listwatch()['watches']
assert len(watches) == initial_count + 3
assert len(our_watches(watches)) == 3
outpoint_a_watch = next(w for w in watches if w.get('outpoint') == test_outpoint_a)
assert len(outpoint_a_watch['owners']) == 1
assert outpoint_a_watch['owners'][0] == 'wallet/p2tr/0'
Expand All @@ -5911,7 +5917,7 @@ def test_bwatch_listwatch(node_factory, bitcoind):
l1.rpc.deloutpointwatch(owner='wallet/p2tr/0', outpoint=test_outpoint_a)

watches = l1.rpc.listwatch()['watches']
assert len(watches) == initial_count + 2
assert len(our_watches(watches)) == 2
assert not any(w.get('outpoint') == test_outpoint_a for w in watches)


Expand Down
Loading