summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/faultTolerance/run.py
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2008-05-21 09:51:58 -0230
committerBenoit Foucher <benoit@zeroc.com>2008-06-06 12:22:56 +0200
commit23b297dc9c61e11d0dfb8be350752ec830cc110c (patch)
treeebb0d8c2dcdcf8160e8e9fbb519b4fe2d9f0505a /cpp/test/Ice/faultTolerance/run.py
parenthttp://bugzilla/bugzilla/show_bug.cgi?id=3216 - mcastServer not initialized. (diff)
downloadice-23b297dc9c61e11d0dfb8be350752ec830cc110c.tar.bz2
ice-23b297dc9c61e11d0dfb8be350752ec830cc110c.tar.xz
ice-23b297dc9c61e11d0dfb8be350752ec830cc110c.zip
Bug 3189 - fix test scripts to use proper start functions
Diffstat (limited to 'cpp/test/Ice/faultTolerance/run.py')
-rwxr-xr-xcpp/test/Ice/faultTolerance/run.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index dc18f80256d..5b579189936 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -33,10 +33,7 @@ base = 12340
for i in range(0, num):
print "starting server #%d..." % (i + 1),
- commandLine = TestUtil.getCommandLine(server, TestUtil.DriverConfig("server")) + " %d" % (base + i)
- if TestUtil.isDebug():
- print "(" + commandLine + ")",
- serverPipe = os.popen(commandLine + " 2>&1")
+ serverPipe = TestUtil.startServer(server, "%d" % (base + i))
TestUtil.getServerPid(serverPipe)
TestUtil.getAdapterReady(serverPipe)
print "ok"
@@ -46,10 +43,7 @@ for i in range(0, num):
ports = "%s %d" % (ports, base + i)
print "starting client...",
-commandLine = TestUtil.getCommandLine(client, TestUtil.DriverConfig("client")) + " " + ports
-if TestUtil.isDebug():
- print "(" + commandLine + ")",
-clientPipe = os.popen(commandLine + " 2>&1")
+clientPipe = TestUtil.startClient(client, ports)
print "ok"
TestUtil.printOutputFromPipe(clientPipe)