From 990f4d0dad68e4ebb36537ffbabe4e0015a3d6d7 Mon Sep 17 00:00:00 2001 From: Dusty Daemon Date: Wed, 25 Oct 2023 13:05:08 -0400 Subject: [PATCH] splice: Update test for new logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The log messages were changed but the test fields weren’t updated, resulting in some test flakiness. Being more explicit with the log message we’re looking for should help. Changelog-None --- tests/test_splicing.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_splicing.py b/tests/test_splicing.py index a696dd28f4c1..424b49c00f4b 100644 --- a/tests/test_splicing.py +++ b/tests/test_splicing.py @@ -37,6 +37,7 @@ def test_splice(node_factory, bitcoind): l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') + l1.daemon.wait_for_log(r'private channel announcement from channeld for ' + first_scid(l1, l2)) inv = l2.rpc.invoice(10**2, '3', 'no_3') l1.rpc.pay(inv['bolt11']) @@ -131,6 +132,7 @@ def test_splice_listnodes(node_factory, bitcoind): l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') + l1.daemon.wait_for_log(r'private channel announcement from channeld for ' + first_scid(l1, l2)) bitcoind.generate_block(7) @@ -164,6 +166,7 @@ def test_splice_out(node_factory, bitcoind): l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') + l1.daemon.wait_for_log(r'private channel announcement from channeld for ' + first_scid(l1, l2)) inv = l2.rpc.invoice(10**2, '3', 'no_3') l1.rpc.pay(inv['bolt11']) @@ -219,6 +222,7 @@ def test_invalid_splice(node_factory, bitcoind): l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') + l1.daemon.wait_for_log(r'private channel announcement from channeld for ' + first_scid(l1, l2)) inv = l2.rpc.invoice(10**2, '3', 'no_3') l1.rpc.pay(inv['bolt11']) @@ -268,6 +272,7 @@ def test_commit_crash_splice(node_factory, bitcoind): l2.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') l1.daemon.wait_for_log(r'CHANNELD_AWAITING_SPLICE to CHANNELD_NORMAL') + l1.daemon.wait_for_log(r'private channel announcement from channeld for ' + first_scid(l1, l2)) time.sleep(1)