From dfa0eb0f2ffd33b6061953fb22819a637a209739 Mon Sep 17 00:00:00 2001 From: niftynei Date: Fri, 11 Dec 2020 16:22:59 -0600 Subject: [PATCH] df-tests: test_shutdown_awaiting_lockin check correct state --- tests/test_connection.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_connection.py b/tests/test_connection.py index c076e7421..1060f7b2f 100644 --- a/tests/test_connection.py +++ b/tests/test_connection.py @@ -699,8 +699,10 @@ def test_shutdown_awaiting_lockin(node_factory, bitcoind): l1.rpc.close(chanid) - l1.daemon.wait_for_log('CHANNELD_AWAITING_LOCKIN to CHANNELD_SHUTTING_DOWN') - l2.daemon.wait_for_log('CHANNELD_AWAITING_LOCKIN to CHANNELD_SHUTTING_DOWN') + l1_state = 'DUALOPEND' if l1.config('experimental-dual-fund') else 'CHANNELD' + l2_state = 'DUALOPEND' if l1.config('experimental-dual-fund') else 'CHANNELD' + l1.daemon.wait_for_log('{}_AWAITING_LOCKIN to CHANNELD_SHUTTING_DOWN'.format(l1_state)) + l2.daemon.wait_for_log('{}_AWAITING_LOCKIN to CHANNELD_SHUTTING_DOWN'.format(l2_state)) l1.daemon.wait_for_log('CHANNELD_SHUTTING_DOWN to CLOSINGD_SIGEXCHANGE') l2.daemon.wait_for_log('CHANNELD_SHUTTING_DOWN to CLOSINGD_SIGEXCHANGE')