pyln-testing: Fix file descriptor leak in bitcoind fixture. ([#7130])

Changelog-Fixed: pyln-testing: Fix file descriptor leak in bitcoind fixture. ([#7130])
ElementsProject · Sep 17, 2024 · e35e3c5 · e35e3c5
1 parent 9e8dd15
commit e35e3c5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/contrib/pyln-testing/pyln/testing/fixtures.py b/contrib/pyln-testing/pyln/testing/fixtures.py
@@ -164,6 +164,8 @@ def bitcoind(directory, teardown_checks):
         bitcoind.proc.kill()
     bitcoind.proc.wait()
 
+    bitcoind.cleanup_files()
+
 
 class TeardownErrors(object):
     def __init__(self):

diff --git a/contrib/pyln-testing/pyln/testing/utils.py b/contrib/pyln-testing/pyln/testing/utils.py
@@ -256,6 +256,14 @@ def kill(self):
         self.proc.kill()
         self.proc.wait()
 
+    def cleanup_files(self):
+        """Ensure files are closed."""
+        for f in ["stdout_write", "stderr_write", "stdout_read", "stderr_read"]:
+            try:
+                getattr(self, f).close()
+            except Exception:
+                pass
+
     def logs_catchup(self):
         """Save the latest stdout / stderr contents; return true if we got anything.
         """