Skip to content

Commit b257fef

Browse files
committed
Unskip (completely) tests w/ unknown outputs because auto_approve
1 parent 4ef913c commit b257fef

File tree

5 files changed

+2
-10
lines changed

5 files changed

+2
-10
lines changed

tests/test_bookkeeper.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ def test_bookkeeping_closing_subsat_htlcs(node_factory, bitcoind, chainparams):
120120

121121

122122
@unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
123-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "remote_hsmd doesn't allow withdrawal to non-wallet, non-allowlisted address")
124123
def test_bookkeeping_external_withdraws(node_factory, bitcoind):
125124
""" Withdrawals to an external address shouldn't be included
126125
in the income statements until confirmed"""
@@ -202,7 +201,6 @@ def test_bookkeeping_external_withdraws(node_factory, bitcoind):
202201

203202
@unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
204203
@unittest.skipIf(os.getenv('TEST_DB_PROVIDER', 'sqlite3') != 'sqlite3', "Depends on sqlite3 database location")
205-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "policy: can't withdraw to non-wallet address")
206204
def test_bookkeeping_external_withdraw_missing(node_factory, bitcoind):
207205
""" Withdrawals to an external address turn up as
208206
extremely large onchain_fees when they happen before
@@ -269,7 +267,6 @@ def test_bookkeeping_external_withdraw_missing(node_factory, bitcoind):
269267

270268

271269
@unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
272-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "policy: can't withdraw to non-wallet address")
273270
def test_bookkeeping_rbf_withdraw(node_factory, bitcoind):
274271
""" If a withdraw to an external gets RBF'd,
275272
it should *not* show up in our income ever.

tests/test_closing.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3055,9 +3055,8 @@ def test_permfail_htlc_out(node_factory, bitcoind, executor):
30553055
bitcoind.generate_block(2)
30563056
wait_for(lambda: l2.rpc.listpeers()['peers'] == [])
30573057

3058-
30593058
@pytest.mark.developer("needs DEVELOPER=1")
3060-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy: can't withdraw to non-wallet address") # FIXME - should work with VLS_PERMISSIVE
3059+
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd'), "policy: can't withdraw to non-wallet address") # FIXME - should work with auto-approve
30613060
def test_permfail(node_factory, bitcoind):
30623061
l1, l2 = node_factory.line_graph(2)
30633062

tests/test_connection.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1658,7 +1658,7 @@ def test_funding_v2_cancel_race(node_factory, bitcoind, executor):
16581658
@pytest.mark.openchannel('v1')
16591659
@pytest.mark.openchannel('v2')
16601660
@unittest.skipIf(TEST_NETWORK != 'regtest', "External wallet support doesn't work with elements yet.")
1661-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "remote_hsmd can't handle random external addresses (allowlist)")
1661+
@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
16621662
def test_funding_close_upfront(node_factory, bitcoind):
16631663
opts = {'plugin': os.path.join(os.getcwd(), 'tests/plugins/openchannel_hook_accepter.py')}
16641664

@@ -2871,7 +2871,6 @@ def mock_donothing(r):
28712871

28722872

28732873
@pytest.mark.developer("needs dev_fail")
2874-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "policy: can't withdraw to non-wallet address")
28752874
def test_no_fee_estimate(node_factory, bitcoind, executor):
28762875
l1 = node_factory.get_node(start=False, options={'dev-no-fake-fees': True})
28772876

tests/test_misc.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ def is_p2wpkh(output):
470470
assert only_one(fundingtx['vin'])['txid'] == res['wallettxid']
471471

472472

473-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "policy: can't withdraw to non-wallet address")
474473
def test_withdraw_misc(node_factory, bitcoind, chainparams):
475474
def dont_spend_outputs(n, txid):
476475
"""Reserve both outputs (we assume there are two!) in case any our ours, so we don't spend change: wrecks accounting checks"""

tests/test_wallet.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828

2929
@unittest.skipIf(TEST_NETWORK != 'regtest', "Test relies on a number of example addresses valid only in regtest")
30-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "policy: can't withdraw to non-wallet address")
3130
def test_withdraw(node_factory, bitcoind):
3231
amount = 1000000
3332
# Don't get any funds from previous runs.
@@ -1491,7 +1490,6 @@ def test_withdraw_nlocktime_fuzz(node_factory, bitcoind):
14911490
raise Exception("No transaction with fuzzed nLockTime !")
14921491

14931492

1494-
@unittest.skipIf(os.getenv('SUBDAEMON').startswith('hsmd:remote_hsmd') and os.getenv('VLS_PERMISSIVE') != '1', "addr2 and addr3 unknown to l1")
14951493
def test_multiwithdraw_simple(node_factory, bitcoind, chainparams):
14961494
"""
14971495
Test simple multiwithdraw usage.

0 commit comments

Comments
 (0)