From 9f044305db470027484f81344719814ea2f45e30 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 17 Aug 2018 13:46:34 +0930 Subject: [PATCH] pytest: dev env var LIGHTNINGD_DEV_LOG_IO turns io logging on immediately. This is required for the next test, which has to log messages from channeld as soon as it starts (so might be too late if it sends SIGUSR1). Signed-off-by: Rusty Russell --- common/status.c | 6 ++++++ tests/utils.py | 6 +++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/status.c b/common/status.c index 66a268d9c..9360ae928 100644 --- a/common/status.c +++ b/common/status.c @@ -36,6 +36,9 @@ static void setup_logging_sighandler(void) void status_setup_sync(int fd) { +#if DEVELOPER + logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL); +#endif assert(status_fd == -1); assert(!status_conn); status_fd = fd; @@ -44,6 +47,9 @@ void status_setup_sync(int fd) void status_setup_async(struct daemon_conn *master) { +#if DEVELOPER + logging_io = (getenv("LIGHTNINGD_DEV_LOG_IO") != NULL); +#endif assert(status_fd == -1); assert(!status_conn); status_conn = master; diff --git a/tests/utils.py b/tests/utils.py index 3a6595a51..ec3524c15 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -684,7 +684,7 @@ class NodeFactory(object): return [j.result() for j in jobs] - def get_node(self, disconnect=None, options=None, may_fail=False, may_reconnect=False, random_hsm=False, feerates=(15000, 7500, 3750), start=True): + def get_node(self, disconnect=None, options=None, may_fail=False, may_reconnect=False, random_hsm=False, feerates=(15000, 7500, 3750), start=True, fake_bitcoin_cli=False, log_all_io=False): with self.lock: node_id = self.next_id self.next_id += 1 @@ -707,6 +707,10 @@ class NodeFactory(object): with open(daemon.disconnect_file, "w") as f: f.write("\n".join(disconnect)) daemon.opts["dev-disconnect"] = "dev_disconnect" + if log_all_io: + assert DEVELOPER + daemon.env["LIGHTNINGD_DEV_LOG_IO"] = "1" + daemon.opts["log-level"] = "io" if DEVELOPER: daemon.opts["dev-fail-on-subdaemon-fail"] = None daemon.env["LIGHTNINGD_DEV_MEMLEAK"] = "1"