Updated fault tolerance tests to correctly destroy the communicator created

    by the client. This has exposed a bug in the Ice run time. With the way
    the test now works, the client receives a ConnectionRefusedException
    whereas, previously, the adapter was deactivated on the server side.
    Depending on how endpoints are shuffled in Reference.cpp, this
    occasionally causes a test failure. It appears that we need to change
    the run time to
- recognize when an endpoint has gone dead and react correctly
- avoid re-trying endpoints that have previously failed
As is, the test gets slower and slower towards the end because it keeps
    trying endpoints of servers that were killed in previous iterations.

1 files changed, 2 insertions, 2 deletions

diff --git a/cpp/test/Ice/faultTolerance/run.py b/cpp/test/Ice/faultTolerance/run.py
index d3882612077..b415944f184 100755
--- a/cpp/test/Ice/faultTolerance/run.py
+++ b/cpp/test/Ice/faultTolerance/run.py
@@ -32,14 +32,14 @@ base = 12340
 serverPipes = { }
 for i in range(0, num):
     print "starting server #%d..." % (i + 1),
-    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + i) + " 2>&1")
+    serverPipes[i] = os.popen(server + TestUtil.serverOptions + " %d" % (base + 2 * i) + " 2>&1")
     TestUtil.getServerPid(serverPipes[i])
     TestUtil.getAdapterReady(serverPipes[i])
     print "ok"
 
 ports = ""
 for i in range(0, num):
-    ports = "%s %d" % (ports, base + i)
+    ports = "%s %d" % (ports, base + 2 * i)
 print "starting client...",
 clientPipe = os.popen(client + TestUtil.clientOptions + " " + ports + " 2>&1")
 print "ok"