diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-12-05 12:08:01 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-12-05 12:08:01 +0100 |
| commit | 57c5e2d61b18e11430ec52afc33f7de1e130e1db (patch) | |
| tree | 31c049c1cdcb6b307806b4c9643a3cd58d3d4adf /cpp | |
| parent | Fixed casts in WinRT hello demo (diff) | |
| download | ice-57c5e2d61b18e11430ec52afc33f7de1e130e1db.tar.bz2 ice-57c5e2d61b18e11430ec52afc33f7de1e130e1db.tar.xz ice-57c5e2d61b18e11430ec52afc33f7de1e130e1db.zip | |
Fixed ICE-5093 - IceGrid/replicaGroup test failure
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceGrid/replicaGroup/run.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/test/IceGrid/replicaGroup/run.py b/cpp/test/IceGrid/replicaGroup/run.py index c43c05a818e..3c74730a833 100755 --- a/cpp/test/IceGrid/replicaGroup/run.py +++ b/cpp/test/IceGrid/replicaGroup/run.py @@ -20,5 +20,13 @@ if len(path) == 0: sys.path.append(os.path.join(path[0], "scripts")) import TestUtil, IceGridAdmin +# +# Don't use a slave registry for this test. This can lead to race +# conditions when resolving endpoints of round-robin replica groups if +# the slave didn't fully load the servers at the time of the client +# invocation +# +IceGridAdmin.nreplicas=0 + IceGridAdmin.iceGridTest("application.xml", "--Ice.RetryIntervals=\"0 50 100 250\"", "icebox.exe='%s'" % TestUtil.getIceBox()) |