Skip to content

Commit e468fec

Browse files
committed
chore(tests): Stabilize test_trampoline_pay
The new CLN versions start the `cln-grpc` plugin by default, causing them to collide on the port, if not disabled.
1 parent 9f754a1 commit e468fec

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

libs/gl-client-py/tests/test_plugin.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ def test_trampoline_pay(bitcoind, clients, node_factory):
6161
l2 = node_factory.get_node(
6262
options={
6363
"plugin": trmp_plugin_path,
64+
"disable-plugin": "cln-grpc",
6465
}
6566
)
6667
n1.connect_peer(l2.info["id"], f"localhost:{l2.port}")
@@ -116,7 +117,7 @@ def test_trampoline_pay(bitcoind, clients, node_factory):
116117
assert len(ch.htlcs) == 0
117118

118119
# new unknown unconnected node without the trampoline featurebit.
119-
l3 = node_factory.get_node()
120+
l3 = node_factory.get_node(options={"disable-plugin": "cln-grpc"})
120121
inv = l2.rpc.invoice(
121122
amount_msat=1000000,
122123
label="trampoline-pay-test-2",
@@ -126,7 +127,6 @@ def test_trampoline_pay(bitcoind, clients, node_factory):
126127
# calling `trampoline_pay` with an unkown tmrp_node_id must fail.
127128
with pytest.raises(
128129
expected_exception=ValueError,
129-
130130
match=f"Unknown peer {l3.info['id']}",
131131
):
132132
res = n1.trampoline_pay(inv["bolt11"], bytes.fromhex(l3.info["id"]))

libs/gl-testing/tests/test_gl_node.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def test_node_network_gl_fund(node_factory, clients, bitcoind):
1717
l1 -> l2 -> gl1
1818
```
1919
"""
20-
l1, l2 = node_factory.line_graph(2)
20+
l1, l2 = node_factory.line_graph(2, opts=[{'disable-plugin': 'cln-grpc'}]*2)
2121
c = clients.new()
2222
c.register(configure=True)
2323
gl1 = c.node()

libs/gl-testing/tests/test_lsps.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ def test_list_lsp_server(
108108
):
109109
# Create a network
110110
n1: LightningNode = node_factory.get_node(
111-
options=dict(plugin=get_lsps_dummy_plugin_path())
111+
options={"plugin": get_lsps_dummy_plugin_path(), "disable-plugin": "cln-grpc"}
112112
)
113113
n2: LightningNode = node_factory.get_node(
114-
options=dict(plugin=get_lsps_dummy_plugin_path())
114+
options={"plugin": get_lsps_dummy_plugin_path(), "disable-plugin": "cln-grpc"}
115115
)
116-
n3: LightningNode = node_factory.get_node()
116+
n3: LightningNode = node_factory.get_node(options={"disable-plugin": "cln-grpc"})
117117

118118
# Create the channel-graph
119119
n1.fundchannel(n2, announce_channel=True)

0 commit comments

Comments
 (0)