From 6b7b7f1007f618123b1a112d9757a9f13577c5cf Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 12 Jan 2018 14:40:00 +1030 Subject: [PATCH] test_lightningd.py: fix timing error in test_forward_different_fees_and_cltv We need to make sure all the updates are known to gossip. Since one is the local update, we change that message to look the same. Signed-off-by: Rusty Russell --- gossipd/gossip.c | 4 +++- tests/test_lightningd.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gossipd/gossip.c b/gossipd/gossip.c index d4f942b38..7a3f0b6ec 100644 --- a/gossipd/gossip.c +++ b/gossipd/gossip.c @@ -790,7 +790,9 @@ static void handle_local_add_channel(struct peer *peer, u8 *msg) c->htlc_minimum_msat = htlc_minimum_msat; c->base_fee = fee_base_msat; c->proportional_fee = fee_proportional_millionths; - status_trace("Added and updated local channel %s/%d", type_to_string(msg, struct short_channel_id, &scid), direction); + status_trace("Channel %s(%d) was updated (LOCAL)", + type_to_string(msg, struct short_channel_id, &scid), + direction); } /** diff --git a/tests/test_lightningd.py b/tests/test_lightningd.py index 7acc73282..ce2dfdeba 100644 --- a/tests/test_lightningd.py +++ b/tests/test_lightningd.py @@ -1614,8 +1614,9 @@ class LightningDTests(BaseLightningDTests): # Make sure l1 has seen announce for all channels. l1.daemon.wait_for_logs([ - 'Channel {}\\(0\\) was updated.'.format(c1), - 'Channel {}\\(1\\) was updated.'.format(c1), + # One of the first two is LOCAL (has (LOCAL) at end of msg) + 'Channel {}\\(0\\) was updated'.format(c1), + 'Channel {}\\(1\\) was updated'.format(c1), 'Channel {}\\(0\\) was updated.'.format(c2), 'Channel {}\\(1\\) was updated.'.format(c2)])