Bug fixes, in particular changed python popen calls to popen4

1 files changed, 6 insertions, 7 deletions

diff --git a/java/test/Ice/faultTolerance/run.py b/java/test/Ice/faultTolerance/run.py
index dde6b58326b..0b89332d592 100755
--- a/java/test/Ice/faultTolerance/run.py
+++ b/java/test/Ice/faultTolerance/run.py
@@ -36,9 +36,10 @@ num = 12
 base = 12340
 
 serverPipes = { }
+serverPipesIn = { }
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i))
+    (serverPipesIn[i], serverPipes[i]) = os.popen4(server + TestUtil.serverOptions + " %d" % (base + i))
     TestUtil.getAdapterReady(serverPipes[i])
     print "ok"
 
@@ -46,20 +47,18 @@ ports = ""
 for i in range(0, num):
     ports = "%s %d" % (ports, base + i)
 print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports)
+(clientPipeIn, clientPipe) = os.popen4(client + TestUtil.clientOptions + " " + ports)
 print "ok"
 
 TestUtil.printOutputFromPipe(clientPipe)
 
-for i in range(0, num):
-    serverPipes[i].close()
-
+clientInStatus = clientPipeIn.close()
 clientStatus = clientPipe.close()
 serverStatus = None
 for i in range(0, num):
-    serverStatus = serverStatus or serverPipes[i].close()
+    serverStatus = serverStatus or serverPipes[i].close() or serverPipesIn[i].close()
 
-if clientStatus or serverStatus:
+if clientInStatus or clientStatus or serverStatus:
     sys.exit(1)
 
 sys.exit(0)