diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-10-11 07:50:31 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-10-11 07:50:31 +0000 |
| commit | 8e9b12de541e2a641c7e450df16e5a78bef20ec1 (patch) | |
| tree | 66236a42905eec0c913479ba406f6688fd879e05 /cpp/test/IceGrid/replication/run.py | |
| parent | file policy.3.1.iceboxcs was initially added on branch R3_1_branch. (diff) | |
| download | ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.tar.bz2 ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.tar.xz ice-8e9b12de541e2a641c7e450df16e5a78bef20ec1.zip | |
Bug fixes, replication test.
Diffstat (limited to 'cpp/test/IceGrid/replication/run.py')
| -rwxr-xr-x | cpp/test/IceGrid/replication/run.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py index 23a03ec8064..915581cc4e8 100755 --- a/cpp/test/IceGrid/replication/run.py +++ b/cpp/test/IceGrid/replication/run.py @@ -26,19 +26,6 @@ testdir = os.path.join(toplevel, "test", name) TestUtil.addLdPath(testdir) -# -# Add locator options for the client and server. Since the server -# invokes on the locator it's also considered to be a client. -# -# NOTE: We also set the retry intervals to retry several times. This -# is necessary for the test to work. The tests invoke successively on -# the same proxy and shutdown the server on each invocation. It takes -# a bit of time for the IceGrid node to detect that the server is down -# and to return a direct proxy from an active server. -# -additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\"" + \ - " --Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --Ice.RetryIntervals=\"0 50 100 250\"" - -IceGridAdmin.iceGridTest(name, "application.xml", "--Ice.RetryIntervals=\"0 50 100 250\"", \ - "icebox.exe=" + TestUtil.getIceBox(testdir)) +IceGridAdmin.iceGridTest(name, "application.xml", "", \ + ' \\"properties-override=' + TestUtil.clientServerOptions.replace("--", "") + '\\"') sys.exit(0) |