diff options
Diffstat (limited to 'java/config/TestUtil.py')
| -rw-r--r-- | java/config/TestUtil.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/config/TestUtil.py b/java/config/TestUtil.py index 893e3fe2fda..d839adceff7 100644 --- a/java/config/TestUtil.py +++ b/java/config/TestUtil.py @@ -169,12 +169,12 @@ def clientServerTestWithOptions(additionalServerOptions, additionalClientOptions client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" #printOutputFromPipe(serverPipe) @@ -198,14 +198,14 @@ def clientServerTestWithClasspath(serverClasspath, clientClasspath): print "starting server...", os.environ["CLASSPATH"] = scp - serverPipe = os.popen(server + serverOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + " 2>&1") os.environ["CLASSPATH"] = classpath getAdapterReady(serverPipe) print "ok" print "starting client...", os.environ["CLASSPATH"] = ccp - clientPipe = os.popen(client + clientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + " 2>&1") os.environ["CLASSPATH"] = classpath print "ok" @@ -229,12 +229,12 @@ def mixedClientServerTestWithOptions(additionalServerOptions, additionalClientOp client = "java -ea Client --Ice.ProgramName=Client " print "starting server...", - serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1", "r", 0) + serverPipe = os.popen(server + serverOptions + additionalServerOptions + " 2>&1") getAdapterReady(serverPipe) print "ok" print "starting client...", - clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1", "r", 0) + clientPipe = os.popen(client + clientOptions + additionalClientOptions + " 2>&1") print "ok" printOutputFromPipe(clientPipe) @@ -255,7 +255,7 @@ def collocatedTestWithOptions(additionalOptions): collocated = "java -ea Collocated --Ice.ProgramName=Collocated " print "starting collocated...", - collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1", "r", 0) + collocatedPipe = os.popen(collocated + collocatedOptions + additionalOptions + " 2>&1") print "ok" printOutputFromPipe(collocatedPipe) |