From 76b80a8d907eb82917d23f29382ac0b7cdbc93c2 Mon Sep 17 00:00:00 2001
From: Michele Ceriotti <michele.ceriotti@gmail.com>
Date: Thu, 16 Nov 2023 13:23:13 -0800
Subject: [PATCH] Possibly I fixed a really stupid bug

---
 ipi/engine/outputs.py   |  3 ++-
 ipi_tests/test_tools.py | 13 ++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ipi/engine/outputs.py b/ipi/engine/outputs.py
index 2e102ece8..4fb5754af 100644
--- a/ipi/engine/outputs.py
+++ b/ipi/engine/outputs.py
@@ -375,7 +375,8 @@ def close_stream(self):
         try:
             if hasattr(self.out, "__getitem__"):
                 for o in self.out:
-                    o.close()
+                    if o is not None:
+                        o.close()
             else:
                 self.out.close()
         except AttributeError:
diff --git a/ipi_tests/test_tools.py b/ipi_tests/test_tools.py
index ad2c5bfda..c769296e8 100644
--- a/ipi_tests/test_tools.py
+++ b/ipi_tests/test_tools.py
@@ -359,12 +359,15 @@ def run(self, cwd, nid):
             assert ipi.returncode == 0, "i-PI error occurred: {}".format(ipi_error)
 
         except sp.TimeoutExpired:
-            
+        
+            ipi.kill()
             try:
                 ipi_out, ipi_error = ipi.communicate(timeout=2)
             except:
                 ipi_out, ipi_error = "", "Could not get outputs from ipi"
                 pass
+
+            drivers[0].kill()
             try:
                 driver_out, driver_err = drivers[0].communicate(timeout=2)                
             except:
@@ -373,11 +376,11 @@ def run(self, cwd, nid):
 
             print("Timeout during {} test \
               **** i-PI output **** \
-              Error {} \
-              Output {} \
+              stdout {} \
+              stderr {} \
               **** driver output **** \
-              Error {} \
-              Output {} \
+              stdout {} \
+              stderr {} \
               ".format(
                     str(cwd), 
                     ipi_out, ipi_error,