aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

pytest: Configure non-legacy tests correctly and filter legacy

Browse Source
This commit is contained in:
Christian Decker
2017-07-10 12:22:00 +02:00
committed by Rusty Russell
parent 843e21826a
commit 943b6526c7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/test_lightningd.py
View File

@@ -103,8 +103,6 @@ class NodeFactory(object):
with open(os.path.join(lightning_dir, "dev_disconnect"), "w") as f: with open(os.path.join(lightning_dir, "dev_disconnect"), "w") as f:
f.write("\n".join(disconnect)) f.write("\n".join(disconnect))
daemon.cmd_line.append("--dev-disconnect=dev_disconnect") daemon.cmd_line.append("--dev-disconnect=dev_disconnect")
# TODO(cdecker) Move into LIGHTNINGD_CONFIG once legacy daemon was removed
daemon.cmd_line.append("--dev-broadcast-interval=1000")
rpc = LightningRpc(socket_path, self.executor) rpc = LightningRpc(socket_path, self.executor)
node = utils.LightningNode(daemon, rpc, bitcoind, self.executor) node = utils.LightningNode(daemon, rpc, bitcoind, self.executor)

4
tests/utils.py
View File

@@ -214,6 +214,8 @@ class LightningD(TailableProc):
'--lightning-dir={}'.format(lightning_dir), '--lightning-dir={}'.format(lightning_dir),
'--port={}'.format(port), '--port={}'.format(port),
'--disable-irc', '--disable-irc',
'--network=regtest',
'--dev-broadcast-interval=1000',
] ]
self.cmd_line += ["--{}={}".format(k, v) for k, v in LIGHTNINGD_CONFIG.items()] self.cmd_line += ["--{}={}".format(k, v) for k, v in LIGHTNINGD_CONFIG.items()]
@@ -235,6 +237,8 @@ class LegacyLightningD(LightningD):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
LightningD.__init__(self, *args, **kwargs) LightningD.__init__(self, *args, **kwargs)
self.cmd_line[0] = 'daemon/lightningd' self.cmd_line[0] = 'daemon/lightningd'
# Filter out non-legacy options
self.cmd_line = [c for c in self.cmd_line if '--network' not in c and '--dev-broadcast-interval' not in c]
def start(self): def start(self):
TailableProc.start(self) TailableProc.start(self)