test script now halt in case of an error

19 files changed, 234 insertions, 25 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)
diff --git a/cpp/test/Freeze/complex/run.py b/cpp/test/Freeze/complex/run.py
index 7de73456f19..b92d45a2947 100755
--- a/cpp/test/Freeze/complex/run.py
+++ b/cpp/test/Freeze/complex/run.py
@@ -43,6 +43,11 @@ if not output:
 print "ok"
 print output
 
+populateStatus = populatePipe.close()
+
+if populateStatus:
+    sys.exit(1)
+
 print "starting verification client...",
 clientPipe = os.popen(client + clientOptions + " validate")
 output = clientPipe.read().strip()
@@ -52,4 +57,9 @@ if not output:
 print "ok"
 print output
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/Freeze/cursor/run.py b/cpp/test/Freeze/cursor/run.py
index 91fc5539d00..4be3945d562 100755
--- a/cpp/test/Freeze/cursor/run.py
+++ b/cpp/test/Freeze/cursor/run.py
@@ -39,4 +39,9 @@ if not output:
 print "ok"
 print output
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/Freeze/dbmap/run.py b/cpp/test/Freeze/dbmap/run.py
index 7ba5d1a5a9f..116e97f4e43 100755
--- a/cpp/test/Freeze/dbmap/run.py
+++ b/cpp/test/Freeze/dbmap/run.py
@@ -40,4 +40,9 @@ if not output:
 print "ok"
 print output
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/Glacier/starter/run.py b/cpp/test/Glacier/starter/run.py
index 334755fb45e..48a30812761 100755
--- a/cpp/test/Glacier/starter/run.py
+++ b/cpp/test/Glacier/starter/run.py
@@ -49,4 +49,10 @@ print "shutting down glacier starter...",
 TestUtil.killServers() # TODO: Graceful shutdown
 print "ok"
 
+starterStatus = starterPipe.close()
+
+if starterStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 29a1a75bec0..d24511afe4d 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -25,13 +25,13 @@ TestI::shutdown(const Ice::Current&)
 void
 TestI::abort(const Ice::Current&)
 {
-    exit(1);
+    exit(0);
 }
 
 void
 TestI::nonmutatingAbort(const Ice::Current&)
 {
-    exit(1);
+    exit(0);
 }
 
 Ice::Int
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index a70f4a96d80..0ec95659b5a 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -57,4 +57,13 @@ while 1:
 	break;
     print output,
 
+clientStatus = clientPipe.close()
+serverStatus = None
+for i in range(0, num):
+    serverStatus = serverStatus or serverPipes[i].close()
+
+if clientStatus or serverStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/Ice/locationForward/run.py b/cpp/test/Ice/locationForward/run.py
index 5ccd6b17252..6b4664bbfdd 100755
--- a/cpp/test/Ice/locationForward/run.py
+++ b/cpp/test/Ice/locationForward/run.py
@@ -61,4 +61,13 @@ while 1:
 	break;
     print output,
 
+clientStatus = clientPipe.close()
+serverStatus = None
+for i in range(0, num):
+    serverStatus = serverStatus or serverPipes[i].close()
+
+if clientStatus or serverStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py
index f3aa635d761..4c1d58adaf5 100755
--- a/cpp/test/IcePack/simple/run.py
+++ b/cpp/test/IcePack/simple/run.py
@@ -42,7 +42,10 @@ print "registering server with icepack...",
 command = icePackAdmin + updatedClientOptions + \
           r' "--IcePack.Admin.Endpoints=default -p 12347 -t 5000" -e "add \"test:default -p 12345 -t 5000\""'
 icePackAdminPipe = os.popen(command)
-icePackAdminPipe.close()
+icePackAdminStatus = icePackAdminPipe.close()
+if icePackAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 name = os.path.join("IcePack", "simple")
@@ -63,7 +66,10 @@ if sys.platform != "cygwin" and sys.platform != "win32":
               r' "--IcePack.Admin.Endpoints=default -p 12347 -t 5000"' + \
               r' -e "add \"test:default -p 12345 -t 5000\" ' + server + updatedServerOptions + '"'
     icePackAdminPipe = os.popen(command)
-    icePackAdminPipe.close()
+    icePackAdminStatus = icePackAdminPipe.close()
+    if icePackAdminStatus:
+        TestUtil.killServers()
+        sys.exit(1)
     print "ok"
 
     print "starting client...",
@@ -86,7 +92,17 @@ print "shutting down icepack...",
 command = icePackAdmin + updatedClientOptions + \
           r' "--IcePack.Admin.Endpoints=default -p 12347 -t 5000" -e "shutdown"'
 icePackAdminPipe = os.popen(command)
-icePackAdminPipe.close()
+icePackAdminStatus = icePackAdminPipe.close()
+if icePackAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
+icePackStatus = icePackPipe.close()
+clientStatus = clientPipe.close()
+
+if icePackStatus or clientStatus:
+    TestUtil.killServers()
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceSSL/certificateAndKeyParsing/run.py b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
index c06aba50d01..517c6a777e5 100755
--- a/cpp/test/IceSSL/certificateAndKeyParsing/run.py
+++ b/cpp/test/IceSSL/certificateAndKeyParsing/run.py
@@ -45,4 +45,10 @@ if not output:
     sys.exit(1)
 print "ok"
 print output
+
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceSSL/certificateVerifier/run.py b/cpp/test/IceSSL/certificateVerifier/run.py
index 35a4fb466f5..96dfdb301a7 100755
--- a/cpp/test/IceSSL/certificateVerifier/run.py
+++ b/cpp/test/IceSSL/certificateVerifier/run.py
@@ -38,4 +38,10 @@ if not output:
     sys.exit(1)
 print "ok"
 print output
+
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceSSL/configuration/run.py b/cpp/test/IceSSL/configuration/run.py
index cc95e7ea743..1d762c7a1af 100755
--- a/cpp/test/IceSSL/configuration/run.py
+++ b/cpp/test/IceSSL/configuration/run.py
@@ -38,4 +38,10 @@ if not output:
     sys.exit(1)
 print "ok"
 print output
+
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceSSL/loadPEM/run.py b/cpp/test/IceSSL/loadPEM/run.py
index 3a5965d6203..4dd35db24f7 100755
--- a/cpp/test/IceSSL/loadPEM/run.py
+++ b/cpp/test/IceSSL/loadPEM/run.py
@@ -44,4 +44,10 @@ if not output:
     sys.exit(1)
 print "ok"
 print output
+
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py
index 09e498c5f26..9e26372e90e 100755
--- a/cpp/test/IceStorm/federation/run.py
+++ b/cpp/test/IceStorm/federation/run.py
@@ -45,22 +45,37 @@ 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...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "link fed1 fed2 10"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "link fed2 fed3 5"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 publisher = os.path.join(testdir, "publisher")
@@ -124,13 +139,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"
 
 #
@@ -139,5 +163,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)
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)
diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py
index c659a95c692..97b30f76fb3 100755
--- a/cpp/test/IceStorm/single/run.py
+++ b/cpp/test/IceStorm/single/run.py
@@ -45,7 +45,10 @@ print "ok"
 print "creating topic...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "create single"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 publisher = os.path.join(testdir, "publisher")
@@ -109,7 +112,10 @@ print "ok"
 print "destroying topic...",
 command = iceStormAdmin + updatedClientOptions + iceStormEndpoint + r' -e "destroy single"'
 iceStormAdminPipe = os.popen(command)
-iceStormAdminPipe.close()
+iceStormAdminStatus = iceStormAdminPipe.close()
+if iceStormAdminStatus:
+    TestUtil.killServers()
+    sys.exit(1)
 print "ok"
 
 #
@@ -118,5 +124,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)
diff --git a/cpp/test/IceUtil/thread/run.py b/cpp/test/IceUtil/thread/run.py
index 65e6bae69c9..8008dba29e9 100755
--- a/cpp/test/IceUtil/thread/run.py
+++ b/cpp/test/IceUtil/thread/run.py
@@ -36,4 +36,9 @@ if not output:
 print "ok"
 print output
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceUtil/unicode/run.py b/cpp/test/IceUtil/unicode/run.py
index 1b7ad902362..b714becc29f 100755
--- a/cpp/test/IceUtil/unicode/run.py
+++ b/cpp/test/IceUtil/unicode/run.py
@@ -53,4 +53,9 @@ print output
 os.remove("numeric.txt")
 os.remove("utf8.txt")
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)
diff --git a/cpp/test/IceXML/encoding/run.py b/cpp/test/IceXML/encoding/run.py
index d46c7cb4950..b1dda2652c0 100755
--- a/cpp/test/IceXML/encoding/run.py
+++ b/cpp/test/IceXML/encoding/run.py
@@ -36,4 +36,9 @@ if not output:
 print "ok"
 print output
 
+clientStatus = clientPipe.close()
+
+if clientStatus:
+    sys.exit(1)
+
 sys.exit(0)