summaryrefslogtreecommitdiff
path: root/java/config/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'java/config/TestUtil.py')
-rw-r--r--java/config/TestUtil.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py
index ce1aa2a7a47..b85e064012f 100644
--- a/java/config/TestUtil.py
+++ b/java/config/TestUtil.py
@@ -73,14 +73,14 @@ def killServers():
# Only used for C++ programs
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):
@@ -93,22 +93,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