summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-04-17 20:14:21 +0000
committerMarc Laukien <marc@zeroc.com>2002-04-17 20:14:21 +0000
commit3b775eb1d9e986f6cb6136ea36089d19988d18b2 (patch)
tree7a5c0e1340fd6188993e6d1ad8e72ae6beaf2036 /cpp/config/TestUtil.py
parentbug fix (diff)
downloadice-3b775eb1d9e986f6cb6136ea36089d19988d18b2.tar.bz2
ice-3b775eb1d9e986f6cb6136ea36089d19988d18b2.tar.xz
ice-3b775eb1d9e986f6cb6136ea36089d19988d18b2.zip
test script now halt in case of an error
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py20
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)