1 files changed, 42 insertions, 8 deletions
diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py
index f2b874acc45..8682dad9ba4 100755
--- a/cpp/test/IceStorm/federation2/run.py
+++ b/cpp/test/IceStorm/federation2/run.py
@@ -45,20 +45,32 @@ print "ok"
 print "creating topics...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "create fed1"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "create fed2"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "create fed3"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 print "linking topics...",
 graph = os.path.join(testdir, "fed.xml");
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "graph ' + graph + r' 10"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 publisher = os.path.join(exedir, "publisher")
@@ -122,13 +134,22 @@ print "ok"
 print "destroying topics...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "destroy fed1"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "destroy fed2"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "destroy fed3"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 #
@@ -137,5 +158,18 @@ print "ok"
 print "shutting down icestorm...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "shutdown"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
+
+iceStormStatus = iceStormPipe.close()
+subscriberStatus = subscriberPipe.close()
+publisherStatus = publisherPipe.close()
+
+if iceStormStatus or subscriberStatus or publisherStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
+sys.exit(0)