pytest: fix flake in testing.

As noted in 0a406230d0 (diff-5871d4c569454db5e625383975462132da0bd03d32df145d8d72d8fafd86d952R3544-R3546)

Turns out we sometimes hang up before l2 sees the previous tx revoked,
so we get a normal unilateral close, not a cheat.

Reported-by: Simon Vrouwe
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2021-11-30 10:43:56 +10:30
parent e2698c5fc3
commit 5a5cf8c696

View File

@ -3540,10 +3540,10 @@ def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
l1.rpc.connect(l2.info['id'], 'localhost', l2.port) l1.rpc.connect(l2.info['id'], 'localhost', l2.port)
l1.daemon.wait_for_log('option_static_remotekey enabled at 1/1') l1.daemon.wait_for_log('option_static_remotekey enabled at 1/1')
# Make sure l2 gets REVOKE_AND_ACK from previous.
l2.daemon.wait_for_log('peer_out WIRE_REVOKE_AND_ACK')
# Pre-statickey penalty works. # Pre-statickey penalty works.
# FIXME: Without this sleep, l1 will broadcasts one tx more compared to good
# case, causing `wait_for_onchaind_broadcast` to timeout.
time.sleep(5)
bitcoind.rpc.sendrawtransaction(tx) bitcoind.rpc.sendrawtransaction(tx)
bitcoind.generate_block(1) bitcoind.generate_block(1)