1 files changed, 20 insertions, 0 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 359c93b6697..1dc926f5e13 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -132,6 +132,13 @@ def clientServerTest(toplevel, name):
 	    break;
 	print output,
 
+    clientStatus = clientPipe.close()
+    serverStatus = serverPipe.close()
+
+    if clientStatus or serverStatus:
+	killServers()
+	sys.exit(1)
+
 def mixedClientServerTest(toplevel, name):
 
     testdir = os.path.join(toplevel, "test", name)
@@ -164,6 +171,13 @@ def mixedClientServerTest(toplevel, name):
 	    break;
 	print output,
 
+    clientStatus = clientPipe.close()
+    serverStatus = serverPipe.close()
+
+    if clientStatus or serverStatus:
+	killServers()
+	sys.exit(1)
+
 def collocatedTest(toplevel, name):
 
     testdir = os.path.join(toplevel, "test", name)
@@ -180,6 +194,12 @@ def collocatedTest(toplevel, name):
     print "ok"
     print output
 
+    collocatedStatus = collocatedPipe.close()
+
+    if collocatedStatus:
+	killServers()
+	sys.exit(1)
+
 def cleanDbDir(path):
 
     files = os.listdir(path)