summaryrefslogtreecommitdiff
path: root/cpp/config/IceGridAdmin.py
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2006-06-08 15:52:59 +0000
committerMatthew Newhook <matthew@zeroc.com>2006-06-08 15:52:59 +0000
commitf9a285ada15643c1205064c468a00a93fa7732eb (patch)
tree4922693f520fd68ebbf5cf2a0abbd995d5d28d8c /cpp/config/IceGridAdmin.py
parentcosmetic edits (diff)
downloadice-f9a285ada15643c1205064c468a00a93fa7732eb.tar.bz2
ice-f9a285ada15643c1205064c468a00a93fa7732eb.tar.xz
ice-f9a285ada15643c1205064c468a00a93fa7732eb.zip
updates to the custom run.py scripts. Updates to TestUtil.py to spawn a
reader thread for servers.
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
-rw-r--r--cpp/config/IceGridAdmin.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py
index 7cb73cf7a6e..8d2e02dfe5c 100644
--- a/cpp/config/IceGridAdmin.py
+++ b/cpp/config/IceGridAdmin.py
@@ -93,10 +93,10 @@ def startIceGridRegistry(port, testdir, dynamicRegistration):
(stdin, iceGridPipe) = os.popen4(command)
TestUtil.getServerPid(iceGridPipe)
- TestUtil.getAdapterReady(iceGridPipe)
- TestUtil.getAdapterReady(iceGridPipe)
- TestUtil.getAdapterReady(iceGridPipe)
- TestUtil.getAdapterReady(iceGridPipe)
+ TestUtil.getAdapterReady(iceGridPipe, False)
+ TestUtil.getAdapterReady(iceGridPipe, False)
+ TestUtil.getAdapterReady(iceGridPipe, False)
+ TestUtil.getAdapterReady(iceGridPipe, False)
print "ok"
readerThread = ReaderThread(iceGridPipe, "IceGridRegistry")
@@ -124,7 +124,7 @@ def startIceGridNode(testdir):
(stdin, iceGridPipe) = os.popen4(command)
TestUtil.getServerPid(iceGridPipe)
- TestUtil.getAdapterReady(iceGridPipe)
+ TestUtil.getAdapterReady(iceGridPipe, False)
TestUtil.waitServiceReady(iceGridPipe, 'node')
print "ok"