summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2004-02-19 16:50:31 +0000
committerMarc Laukien <marc@zeroc.com>2004-02-19 16:50:31 +0000
commit2561876290cdafb177025a6ec9597e3b4d052d7b (patch)
tree963061538095c49969b8fa7b7116b3eed56a42ad /cpp/config/TestUtil.py
parentWe need a minimum of 2 threads for the thread pool (diff)
downloadice-2561876290cdafb177025a6ec9597e3b4d052d7b.tar.bz2
ice-2561876290cdafb177025a6ec9597e3b4d052d7b.tar.xz
ice-2561876290cdafb177025a6ec9597e3b4d052d7b.zip
fix
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 82690cc04f1..0c1b16d3c44 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -114,18 +114,18 @@ def killServers():
def getServerPid(serverPipe):
- output = serverPipe.readline()
+ output = serverPipe.readline().strip()
if not output:
print "failed!"
killServers()
sys.exit(1)
- serverPids.append(int(output.strip()))
+ serverPids.append(int(output))
def getAdapterReady(serverPipe):
- output = serverPipe.readline()
+ output = serverPipe.readline().strip()
if not output:
print "failed!"
@@ -134,22 +134,23 @@ def getAdapterReady(serverPipe):
def waitServiceReady(pipe, token):
- while 1:
+ while True:
- output = pipe.readline()
+ output = pipe.readline().strip()
if not output:
print "failed!"
sys.exit(1)
- if output.strip() == token + " ready":
+ if output == token + " ready":
break
def printOutputFromPipe(pipe):
- while 1:
+ while True:
line = pipe.readline()
+
if not line:
break