Skip to content

Commit f48c7ee

Browse files
committed
Skip test which are not valid w/ VLS
1 parent e2c9f32 commit f48c7ee

14 files changed

+103
-2
lines changed

tests/test_bookkeeper.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ def test_bookkeeping_rbf_withdraw(node_factory, bitcoind):
332332
assert len(fees) == 1
333333

334334

335+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "hsmd_sign_option_will_fund_offer not supported")
335336
@pytest.mark.openchannel('v2')
336337
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "turns off bookkeeper at start")
337338
@unittest.skipIf(TEST_NETWORK != 'regtest', "network fees hardcoded")
@@ -408,6 +409,7 @@ def _check_events(node, channel_id, exp_events):
408409

409410
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "turns off bookkeeper at start")
410411
@unittest.skipIf(TEST_NETWORK != 'regtest', "network fees hardcoded")
412+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "remote_hsmd doesn't allow push of non-trivial amount")
411413
@pytest.mark.openchannel('v1', 'Uses push-msat')
412414
def test_bookkeeping_missed_chans_pushed(node_factory, bitcoind):
413415
"""
@@ -599,6 +601,7 @@ def test_bookkeeping_onchaind_txs(node_factory, bitcoind):
599601
assert outs == only_one(wallet_bal['balances'])['balance_msat']
600602

601603

604+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "invoice from offer: Invalid bech32: invalid checksum")
602605
def test_bookkeeping_descriptions(node_factory, bitcoind, chainparams):
603606
"""
604607
When an 'invoice' type event comes through, we look up the description details

tests/test_closing.py

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,7 @@ def test_closing_negotiation_step_700sat(node_factory, bitcoind, chainparams):
482482
closing_negotiation_step(node_factory, bitcoind, chainparams, opts)
483483

484484

485+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "dev_sign_last_tx causes subsequent validate_holder_commitment_tx failure")
485486
@pytest.mark.parametrize("anchors", [False, True])
486487
def test_penalty_inhtlc(node_factory, bitcoind, executor, chainparams, anchors):
487488
"""Test penalty transaction with an incoming HTLC"""
@@ -614,6 +615,7 @@ def test_penalty_inhtlc(node_factory, bitcoind, executor, chainparams, anchors):
614615
check_utxos_channel(l2, [channel_id], expected_2, tags)
615616

616617

618+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "dev_sign_last_tx causes subsequent validate_holder_commitment_tx failure")
617619
@pytest.mark.parametrize("anchors", [False, True])
618620
def test_penalty_outhtlc(node_factory, bitcoind, executor, chainparams, anchors):
619621
"""Test penalty transaction with an outgoing HTLC"""
@@ -750,6 +752,7 @@ def test_penalty_outhtlc(node_factory, bitcoind, executor, chainparams, anchors)
750752

751753

752754
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
755+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "handle_sign_option_will_fund_offer unimplemented")
753756
@pytest.mark.openchannel('v2')
754757
@pytest.mark.slow_test
755758
def test_channel_lease_falls_behind(node_factory, bitcoind):
@@ -791,6 +794,7 @@ def test_channel_lease_falls_behind(node_factory, bitcoind):
791794

792795

793796
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
797+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "handle_sign_option_will_fund_offer unimplemented")
794798
@pytest.mark.openchannel('v2')
795799
@pytest.mark.slow_test
796800
def test_channel_lease_post_expiry(node_factory, bitcoind, chainparams):
@@ -892,6 +896,7 @@ def test_channel_lease_post_expiry(node_factory, bitcoind, chainparams):
892896

893897

894898
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
899+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "handle_sign_option_will_fund_offer unimplemented")
895900
@pytest.mark.openchannel('v2')
896901
@pytest.mark.slow_test
897902
def test_channel_lease_unilat_closes(node_factory, bitcoind):
@@ -1004,6 +1009,7 @@ def test_channel_lease_unilat_closes(node_factory, bitcoind):
10041009

10051010

10061011
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
1012+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "handle_sign_option_will_fund_offer unimplemented")
10071013
@pytest.mark.openchannel('v2')
10081014
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Makes use of the sqlite3 db")
10091015
def test_channel_lease_lessor_cheat(node_factory, bitcoind, chainparams):
@@ -1080,6 +1086,7 @@ def test_channel_lease_lessor_cheat(node_factory, bitcoind, chainparams):
10801086

10811087

10821088
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
1089+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "handle_sign_option_will_fund_offer unimplemented")
10831090
@pytest.mark.openchannel('v2')
10841091
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Makes use of the sqlite3 db")
10851092
def test_channel_lease_lessee_cheat(node_factory, bitcoind, chainparams):
@@ -1156,6 +1163,7 @@ def test_channel_lease_lessee_cheat(node_factory, bitcoind, chainparams):
11561163

11571164

11581165
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Makes use of the sqlite3 db")
1166+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy: can't sign revoked commitment number") # FIXME - should work w/ VLS_PERMISSIVE
11591167
@pytest.mark.slow_test
11601168
@pytest.mark.parametrize("anchors", [False, True])
11611169
def test_penalty_htlc_tx_fulfill(node_factory, bitcoind, chainparams, anchors):
@@ -1340,6 +1348,7 @@ def test_penalty_htlc_tx_fulfill(node_factory, bitcoind, chainparams, anchors):
13401348

13411349

13421350
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Makes use of the sqlite3 db")
1351+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy: can't sign revoked commitment number") # FIXME - should work with VLS_PERMISSIVE
13431352
@pytest.mark.slow_test
13441353
@pytest.mark.parametrize("anchors", [False, True])
13451354
def test_penalty_htlc_tx_timeout(node_factory, bitcoind, chainparams, anchors):
@@ -1568,6 +1577,7 @@ def test_penalty_htlc_tx_timeout(node_factory, bitcoind, chainparams, anchors):
15681577
assert acc['resolved_at_block'] > 0
15691578

15701579

1580+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "exceeds max fee policy")
15711581
@pytest.mark.parametrize("anchors", [False, True])
15721582
def test_penalty_rbf_normal(node_factory, bitcoind, executor, chainparams, anchors):
15731583
'''
@@ -2851,6 +2861,7 @@ def route_to_l1(src):
28512861

28522862

28532863
@pytest.mark.slow_test
2864+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "frequently flakes")
28542865
def test_onchain_multihtlc_our_unilateral(node_factory, bitcoind):
28552866
"""Node pushes a channel onchain with multiple HTLCs with same payment_hash """
28562867
h, l1, l2, l3, l4, l5, l6, l7 = setup_multihtlc_test(node_factory, bitcoind)
@@ -2906,6 +2917,7 @@ def test_onchain_multihtlc_our_unilateral(node_factory, bitcoind):
29062917

29072918

29082919
@pytest.mark.slow_test
2920+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "frequently flakes")
29092921
def test_onchain_multihtlc_their_unilateral(node_factory, bitcoind):
29102922
"""Node pushes a channel onchain with multiple HTLCs with same payment_hash """
29112923
h, l1, l2, l3, l4, l5, l6, l7 = setup_multihtlc_test(node_factory, bitcoind)
@@ -3068,7 +3080,7 @@ def test_permfail_htlc_out(node_factory, bitcoind, executor):
30683080
bitcoind.generate_block(2)
30693081
wait_for(lambda: l2.rpc.listpeers()['peers'] == [])
30703082

3071-
3083+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy: can't withdraw to non-wallet address") # FIXME - should work with auto-approve
30723084
def test_permfail(node_factory, bitcoind):
30733085
l1, l2 = node_factory.line_graph(2)
30743086

@@ -3168,6 +3180,7 @@ def test_shutdown(node_factory):
31683180
l1.rpc.stop()
31693181

31703182

3183+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy failure: validate_mutual_close_tx: holder_script doesn't match upfront holder_shutdown_script") # FIXME - should work with VLS_PERMISSIVE
31713184
def test_option_upfront_shutdown_script(node_factory, bitcoind, executor, chainparams):
31723185
l1 = node_factory.get_node(start=False, allow_warning=True)
31733186
# Insist on upfront script we're not going to match.

tests/test_connection.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,7 @@ def test_disconnect_fundee(node_factory):
584584
assert len(l2.rpc.listpeers()) == 1
585585

586586

587+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
587588
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
588589
@pytest.mark.openchannel('v2')
589590
def test_disconnect_fundee_v2(node_factory):
@@ -660,6 +661,7 @@ def test_disconnect_half_signed_v2(node_factory):
660661
assert len(l1.rpc.listpeerchannels(l2.info['id'])['channels']) == 1
661662

662663

664+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
663665
@pytest.mark.openchannel('v1')
664666
@pytest.mark.openchannel('v2')
665667
def test_reconnect_signed(node_factory):
@@ -1209,6 +1211,7 @@ def test_v2_open(node_factory, bitcoind, chainparams):
12091211
assert(result['status'] == 'complete')
12101212

12111213

1214+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "channel push not allowed: dual-funding not supported yet")
12121215
@pytest.mark.openchannel('v1')
12131216
def test_funding_push(node_factory, bitcoind, chainparams):
12141217
""" Try to push peer some sats """
@@ -1639,6 +1642,7 @@ def test_funding_v2_cancel_race(node_factory, bitcoind, executor):
16391642
@pytest.mark.openchannel('v1')
16401643
@pytest.mark.openchannel('v2')
16411644
@unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
1645+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "remote_hsmd can't handle random external addresses (allowlist)") # FIXME - should work w/ auto-approve
16421646
def test_funding_close_upfront(node_factory, bitcoind):
16431647
opts = {'plugin': os.path.join(os.getcwd(), 'tests/plugins/openchannel_hook_accepter.py')}
16441648

@@ -1786,6 +1790,7 @@ def test_funding_external_wallet(node_factory, bitcoind):
17861790

17871791
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
17881792
@pytest.mark.openchannel('v1') # We manually turn on dual-funding for select nodes
1793+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "commit c0cc285a causes: channel stub can only return point for commitment number zero")
17891794
def test_multifunding_v1_v2_mixed(node_factory, bitcoind):
17901795
'''
17911796
Simple test for multifundchannel, using v1 + v2
@@ -1832,6 +1837,7 @@ def test_multifunding_v1_v2_mixed(node_factory, bitcoind):
18321837
l1.rpc.pay(inv)
18331838

18341839

1840+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_SKIP_SPLICE_TESTS') == '1', "test expected to fail before VLS dual-funding / splicing support")
18351841
@unittest.skipIf(TEST_NETWORK != 'regtest', 'elementsd doesnt yet support PSBT features we need')
18361842
@pytest.mark.openchannel('v2')
18371843
def test_multifunding_v2_exclusive(node_factory, bitcoind):
@@ -2047,6 +2053,7 @@ def test_multifunding_wumbo(node_factory):
20472053
l1.rpc.multifundchannel(destinations)
20482054

20492055

2056+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "flakes too frequently w/ VLS")
20502057
@unittest.skipIf(TEST_NETWORK == 'liquid-regtest', "Fees on elements are different")
20512058
@pytest.mark.openchannel('v1') # v2 the weight calculation is off by 3
20522059
@pytest.mark.parametrize("anchors", [False, True])
@@ -2440,6 +2447,7 @@ def test_update_fee(node_factory, bitcoind):
24402447
l2.daemon.wait_for_log('onchaind complete, forgetting peer')
24412448

24422449

2450+
@pytest.mark.developer
24432451
def test_fee_limits(node_factory, bitcoind):
24442452
l1, l2, l3, l4 = node_factory.get_nodes(4, opts=[{'dev-max-fee-multiplier': 5, 'may_reconnect': True,
24452453
'allow_warning': True},
@@ -3573,6 +3581,8 @@ def test_channel_features(node_factory, bitcoind, anchors):
35733581
assert only_one(l2.rpc.listpeerchannels()['channels'])['features'] == chan['features']
35743582

35753583

3584+
@pytest.mark.developer("need dev-force-features")
3585+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support non-option_static_remotekey") # FIXME - should work with VLS_PERMISSIVE
35763586
def test_nonstatic_channel(node_factory, bitcoind):
35773587
"""Smoke test for a channel without option_static_remotekey"""
35783588
l1, l2 = node_factory.line_graph(2,
@@ -3688,6 +3698,7 @@ def test_openchannel_init_alternate(node_factory, executor):
36883698
print("nothing to do")
36893699

36903700

3701+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "upgrade not yet supported by VLS")
36913702
def test_upgrade_statickey(node_factory, executor):
36923703
"""l1 doesn't have option_static_remotekey, l2 offers it."""
36933704
l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True,
@@ -3718,6 +3729,7 @@ def test_upgrade_statickey(node_factory, executor):
37183729
l2.daemon.wait_for_log(r"They sent desired_channel_type \[12\]")
37193730

37203731

3732+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "upgrade not yet supported by VLS")
37213733
def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
37223734
"""We test penalty before/after, and unilateral before/after"""
37233735
l1, l2 = node_factory.line_graph(2, opts=[{'may_reconnect': True,
@@ -3852,6 +3864,7 @@ def test_upgrade_statickey_onchaind(node_factory, executor, bitcoind):
38523864
wait_for(lambda: len(l2.rpc.listpeerchannels()['channels']) == 0)
38533865

38543866

3867+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "upgrade not yet supported by VLS")
38553868
def test_upgrade_statickey_fail(node_factory, executor, bitcoind):
38563869
"""We reconnect at all points during retransmit, and we won't upgrade."""
38573870
l1_disconnects = ['-WIRE_COMMITMENT_SIGNED',

tests/test_db.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ def test_max_channel_id(node_factory, bitcoind):
136136
@unittest.skipIf(not COMPAT, "needs COMPAT to convert obsolete db")
137137
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "This test is based on a sqlite3 snapshot")
138138
@unittest.skipIf(TEST_NETWORK != 'regtest', "The network must match the DB snapshot")
139+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't like channel_nonce changing")
139140
def test_scid_upgrade(node_factory, bitcoind):
140141
bitcoind.generate_block(1)
141142

@@ -167,6 +168,7 @@ def test_scid_upgrade(node_factory, bitcoind):
167168
@unittest.skipIf(not COMPAT, "needs COMPAT to convert obsolete db")
168169
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "This test is based on a sqlite3 snapshot")
169170
@unittest.skipIf(TEST_NETWORK != 'regtest', "The network must match the DB snapshot")
171+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't like channel_nonce changing")
170172
def test_last_tx_inflight_psbt_upgrade(node_factory, bitcoind):
171173
bitcoind.generate_block(12)
172174

@@ -185,6 +187,7 @@ def test_last_tx_inflight_psbt_upgrade(node_factory, bitcoind):
185187
@unittest.skipIf(not COMPAT, "needs COMPAT to convert obsolete db")
186188
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "This test is based on a sqlite3 snapshot")
187189
@unittest.skipIf(TEST_NETWORK != 'regtest', "The network must match the DB snapshot")
190+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't like channel_nonce changing")
188191
def test_last_tx_psbt_upgrade(node_factory, bitcoind):
189192
bitcoind.generate_block(12)
190193

@@ -219,6 +222,7 @@ def test_last_tx_psbt_upgrade(node_factory, bitcoind):
219222
@pytest.mark.slow_test
220223
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "This test is based on a sqlite3 snapshot")
221224
@unittest.skipIf(TEST_NETWORK != 'regtest', "The network must match the DB snapshot")
225+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support backfill yet")
222226
def test_backfill_scriptpubkeys(node_factory, bitcoind):
223227
bitcoind.generate_block(214)
224228

@@ -352,6 +356,7 @@ def get_dsn(self):
352356
os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3',
353357
"This test is based on a sqlite3 snapshot"
354358
)
359+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support DB migration")
355360
def test_local_basepoints_cache(bitcoind, node_factory):
356361
"""XXX started caching the local basepoints as well as the remote ones.
357362
@@ -440,6 +445,7 @@ def test_sqlite3_builtin_backup(bitcoind, node_factory):
440445

441446

442447
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Don't know how to swap dbs in Postgres")
448+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "vlsd chokes on allowlist when started on wrong network")
443449
def test_db_sanity_checks(bitcoind, node_factory):
444450
l1, l2 = node_factory.get_nodes(2, opts=[{'allow_broken_log': True,
445451
'may_fail': True}, {}])

tests/test_gossip.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ def test_announce_dns_suppressed(node_factory, bitcoind):
182182
assert addresses[0]['port'] == 1236
183183

184184

185+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "trouble with IPv6 in VLS CI runner")
185186
def test_announce_and_connect_via_dns(node_factory, bitcoind):
186187
""" Test that DNS annoucements propagate and can be used when connecting.
187188

tests/test_invoices.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ def test_invoice_weirdstring(node_factory):
130130
l1.rpc.delinvoice(weird_label, "unpaid")
131131

132132

133+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "VLS policies catch two-invoice-one-preimage ahead of the node") # FIXME - should work with VLS_PERMISSIVE
133134
def test_invoice_preimage(node_factory):
134135
"""Test explicit invoice 'preimage'.
135136
"""

tests/test_misc.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1145,6 +1145,7 @@ def test_cli_commando(node_factory):
11451145
assert only_one(j['invoices'])['label'] == 'l"[]{}'
11461146

11471147

1148+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd integration test job control fails here")
11481149
def test_daemon_option(node_factory):
11491150
"""
11501151
Make sure --daemon at least vaguely works!
@@ -2173,6 +2174,7 @@ def test_bitcoind_feerate_floor(node_factory, bitcoind, anchors):
21732174

21742175

21752176
@unittest.skipIf(TEST_NETWORK != 'regtest', "Addresses are network specific")
2177+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support forced secrets")
21762178
def test_dev_force_bip32_seed(node_factory):
21772179
l1 = node_factory.get_node(options={'dev-force-bip32-seed': '0000000000000000000000000000000000000000000000000000000000000001'})
21782180
# First is m/0/0/1 ..
@@ -2511,6 +2513,7 @@ def test_regtest_upgrade(node_factory):
25112513

25122514
@unittest.skipIf(VALGRIND, "valgrind files can't be written since we rmdir")
25132515
@unittest.skipIf(TEST_NETWORK != "regtest", "needs bitcoin mainnet")
2516+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't create hsm_secret file")
25142517
def test_new_node_is_mainnet(node_factory):
25152518
"""Test that an empty directory causes us to be on mainnet"""
25162519
l1 = node_factory.get_node(start=False, may_fail=True)
@@ -2674,6 +2677,7 @@ def test_sendcustommsg(node_factory):
26742677
])
26752678

26762679

2680+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support dev-force-privkey")
26772681
def test_makesecret(node_factory):
26782682
"""
26792683
Test makesecret command.
@@ -2711,6 +2715,7 @@ def test_staticbackup(node_factory):
27112715
and l1.rpc.staticbackup()["scb"][0][16: 16 + 64] == _["channel_id"])
27122716

27132717

2718+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd says no such channel")
27142719
def test_recoverchannel(node_factory):
27152720
"""
27162721
Test recoverchannel
@@ -3744,6 +3749,7 @@ def test_setconfig(node_factory, bitcoind):
37443749
assert len(lines) == 3
37453750

37463751

3752+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "remote_hsmd doesn't support this command")
37473753
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "deletes database, which is assumed sqlite3")
37483754
def test_recover_command(node_factory, bitcoind):
37493755
l1, l2 = node_factory.get_nodes(2)

0 commit comments

Comments
 (0)