Merge #1269: Couple fixes to the functional tests

7cce13656266d90431133ccb4de5ccf086f4aa82 qa: test proc stderr isn't None before closing it (Antoine Poinsot)
ba553e9ddb104af454d9eff9969c0e37a1f3061a qa: adapt bitcoind config to support 28.0 (Antoine Poinsot)

Pull request description:

ACKs for top commit:
  darosior:
    ACK 7cce13656266d90431133ccb4de5ccf086f4aa82

Tree-SHA512: ff0a9addd6063cd31b8e7f76cbf2b7ed1f5e85c2d7192ed5e73bba1c81a3bb4e8740ff7c5242d054115e28e484c87f85cafcbbc4dcc4ecf24ff415a028e1b0b5

tests/test_framework/bitcoind.py

@@ -68,7 +68,7 @@ class Bitcoind(BitcoinBackend):
             "-debugexclude=tor",
         ]
         bitcoind_conf = {
-            "port": self.p2pport,
+            "bind": f"127.0.0.1:{self.p2pport}",
             "rpcport": rpcport,
             "fallbackfee": Decimal(1000) / COIN,
             "rpcthreads": 32,

tests/test_framework/utils.py

@@ -375,7 +375,8 @@ class TailableProc(object):
                 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."""