df-test: make flakey test not as flakey

This would flake fairly regularly, what we really care about is
asserting that the l2 node is in CHANNELD_NORMAL state, while the l1
node hasn't progressed that far yet.
This commit is contained in:
niftynei 2021-05-11 15:50:25 -05:00 committed by Rusty Russell
parent c75ca8c112
commit ce1e5bd388

View File

@ -529,7 +529,7 @@ def test_reconnect_no_update(node_factory, executor, bitcoind):
"""
disconnects = ["@WIRE_FUNDING_LOCKED", "@WIRE_SHUTDOWN"]
# Allow bad gossip because it might receive WIRE_CHANNEL_UPDATE before
# announcement before of the disconnection
# announcement of the disconnection
l1 = node_factory.get_node(may_reconnect=True, allow_bad_gossip=True)
l2 = node_factory.get_node(disconnect=disconnects, may_reconnect=True)
@ -542,7 +542,7 @@ def test_reconnect_no_update(node_factory, executor, bitcoind):
# automatic retry.
fundchannel_exec = executor.submit(l1.fundchannel, l2, 10**6, False)
if l1.config('experimental-dual-fund'):
l2.daemon.wait_for_log(r"Unexpected `tx_signatures` from peer. Allowing.")
l2.daemon.wait_for_log(r"Peer has reconnected, state CHANNELD_NORMAL")
l1.daemon.wait_for_log(r"dualopend.* Retransmitting funding_locked for channel")
else:
l1.daemon.wait_for_log(r"channeld.* Retransmitting funding_locked for channel")