summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2006-06-05 16:53:21 +0000
committerMatthew Newhook <matthew@zeroc.com>2006-06-05 16:53:21 +0000
commitdc99d7ec93b9457b924d168b9b55543613963f0e (patch)
treeebb3cf194a2e7d0e1bd2bf455f9c3632f1b97a0a /cpp/config/TestUtil.py
parent- Changes to align dynamic filtering with the current Glacier2Filters wiki (diff)
downloadice-dc99d7ec93b9457b924d168b9b55543613963f0e.tar.bz2
ice-dc99d7ec93b9457b924d168b9b55543613963f0e.tar.xz
ice-dc99d7ec93b9457b924d168b9b55543613963f0e.zip
supress warnings.
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 2b88b7efce7..b4915095d8d 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -334,7 +334,6 @@ def clientServerTestWithOptionsAndNames(name, additionalServerOptions, additiona
printOutputFromPipe(clientPipe)
clientStatus = closePipe(clientPipe)
- #serverStatus = closePipe(serverPipe)
serverThread.join()
serverStatus = serverThread.getStatus()
@@ -368,10 +367,13 @@ def mixedClientServerTestWithOptions(name, additionalServerOptions, additionalCl
getAdapterReady(clientPipe)
print "ok"
+ serverThread = ReaderThread(serverPipe, "Server")
+ serverThread.start()
printOutputFromPipe(clientPipe)
clientStatus = closePipe(clientPipe)
- serverStatus = closePipe(serverPipe)
+ serverThread.join()
+ serverStatus = serverThread.getStatus()
if clientStatus or serverStatus:
killServers()