Skip to content

pytest: Fix flaky test_closing_id test #1473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustyrussell merged 1 commit into from
May 8, 2018
Merged

pytest: Fix flaky test_closing_id test #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions tests/test_closing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
from fixtures import * # noqa: F401,F403

import os


DEVELOPER = os.getenv("DEVELOPER", "0") == "1"


def test_closing_id(node_factory):
"""Test closing using peer ID and full channel ID
"""
l1, l2 = node_factory.get_nodes(2)

# Close by full channel ID.
l1.rpc.connect(l2.info['id'], 'localhost', l2.info['port'])
l1.fund_channel(l2, 10**6)
cid = l2.rpc.listpeers()['peers'][0]['channels'][0]['channel_id']
l2.rpc.close(cid)
l1.daemon.wait_for_log("Forgetting remote peer .*")
l2.daemon.wait_for_log("Forgetting remote peer .*")

# Close by peer ID.
l2.rpc.connect(l1.info['id'], 'localhost', l1.info['port'])
l1.daemon.wait_for_log("hand_back_peer .*: now local again")
l2.fund_channel(l1, 10**6)
pid = l1.info['id']
l2.rpc.close(pid)
l1.daemon.wait_for_log("Forgetting remote peer .*")
l2.daemon.wait_for_log("Forgetting remote peer .*")
15 changes: 0 additions & 15 deletions tests/test_lightningd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1288,21 +1288,6 @@ def test_bad_opening(self):

l2.daemon.wait_for_log('to_self_delay 100 larger than 99')

def test_closing_id(self):
"""Test closing using peer ID and full channel ID"""
l1, l2 = self.connect()

# Close by full channel ID.
self.fund_channel(l1, l2, 10**6)
cid = l2.rpc.listpeers()['peers'][0]['channels'][0]['channel_id']
l2.rpc.close(cid)

# Close by peer ID.
l1.rpc.connect(l2.info['id'])
self.fund_channel(l2, l1, 10**6)
pid = l1.info['id']
l2.rpc.close(pid)

def test_closing(self):
l1, l2 = self.connect()

Expand Down