Possibly I fixed a really stupid bug

lab-cosmo · Nov 16, 2023 · 76b80a8 · 76b80a8
1 parent 0a58d41
commit 76b80a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git 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
@@ -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,