summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-03-25 18:00:45 +0000
committerMarc Laukien <marc@zeroc.com>2002-03-25 18:00:45 +0000
commita05da212572f88c6e92f3bacf786e22f632f7dc6 (patch)
tree5fb033501b140ff281164661d8347d3d31446cbc /cpp/config/TestUtil.py
parentmake depend (diff)
downloadice-a05da212572f88c6e92f3bacf786e22f632f7dc6.tar.bz2
ice-a05da212572f88c6e92f3bacf786e22f632f7dc6.tar.xz
ice-a05da212572f88c6e92f3bacf786e22f632f7dc6.zip
fixes
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index b8765f7adcc..b9b80624ffb 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -132,7 +132,7 @@ def clientServerTest(toplevel, name):
break;
print output,
-def clientServerHybridTest(toplevel, name):
+def mixedClientServerTest(toplevel, name):
testdir = os.path.join(toplevel, "test", name)
server = os.path.join(testdir, "server")
@@ -149,6 +149,8 @@ def clientServerHybridTest(toplevel, name):
print "starting client...",
clientPipe = os.popen(client + updatedClientOptions)
+ getServerPid(clientPipe)
+ getAdapterReady(clientPipe)
output = clientPipe.readline()
if not output:
print "failed!"