pytest: Split the python integration tests into new and legacy

This commit is contained in:
Christian Decker
2017-01-17 23:30:22 +01:00
parent 5f61b3a272
commit 180c96776b
2 changed files with 44 additions and 11 deletions

View File

@@ -160,7 +160,7 @@ class LightningD(TailableProc):
self.lightning_dir = lightning_dir
self.port = port
self.cmd_line = [
'daemon/lightningd',
'lightningd/lightningd',
'--bitcoin-datadir={}'.format(bitcoin_dir),
'--lightning-dir={}'.format(lightning_dir),
'--port={}'.format(port),
@@ -176,13 +176,24 @@ class LightningD(TailableProc):
def start(self):
TailableProc.start(self)
self.wait_for_log("Hello world!")
self.wait_for_log("Creating IPv6 listener on port")
logging.info("LightningD started")
def stop(self):
TailableProc.stop(self)
logging.info("LightningD stopped")
class LegacyLightningD(LightningD):
def __init__(self, *args, **kwargs):
LightningD.__init__(self, *args, **kwargs)
self.cmd_line[0] = 'daemon/lightningd'
def start(self):
TailableProc.start(self)
self.wait_for_log("Hello world!")
logging.info("LightningD started")
class LightningNode(object):
def __init__(self, daemon, rpc, btc, executor):
self.rpc = rpc