From ba553e9ddb104af454d9eff9969c0e37a1f3061a Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Thu, 5 Sep 2024 14:31:01 +0200 Subject: [PATCH 1/2] qa: adapt bitcoind config to support 28.0 Got broken by https://github.com/bitcoin/bitcoin/commit/bca346a97056748f1e3fb899f336d56d9fd45a64 --- tests/test_framework/bitcoind.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_framework/bitcoind.py b/tests/test_framework/bitcoind.py index ab8e69ac3..4513f87da 100644 --- a/tests/test_framework/bitcoind.py +++ b/tests/test_framework/bitcoind.py @@ -61,7 +61,7 @@ def __init__(self, bitcoin_dir, rpcport=None): "-debugexclude=tor", ] bitcoind_conf = { - "port": self.p2pport, + "bind": f"127.0.0.1:{self.p2pport}", "rpcport": rpcport, "fallbackfee": Decimal(1000) / COIN, "rpcthreads": 32, From 7cce13656266d90431133ccb4de5ccf086f4aa82 Mon Sep 17 00:00:00 2001 From: Antoine Poinsot Date: Thu, 5 Sep 2024 14:32:03 +0200 Subject: [PATCH 2/2] qa: test proc stderr isn't None before closing it --- tests/test_framework/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/test_framework/utils.py b/tests/test_framework/utils.py index 7f961038b..37f588e3f 100644 --- a/tests/test_framework/utils.py +++ b/tests/test_framework/utils.py @@ -360,7 +360,8 @@ def tail(self): self.logs_cond.notifyAll() self.running = False self.proc.stdout.close() - self.proc.stderr.close() + if self.proc.stderr is not None: + self.proc.stderr.close() def is_in_log(self, regex, start=0): """Look for `regex` in the logs."""