diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-09-27 11:37:26 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-09-27 11:37:26 -0400 |
| commit | 29aad94424e506d30ba89c18e3ce3d5fecc03dcc (patch) | |
| tree | 9acda23df0d372428fe500ff55a02d07db382792 /cpp/test/IceStorm/federation/run.py | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.tar.bz2 ice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.tar.xz ice-29aad94424e506d30ba89c18e3ce3d5fecc03dcc.zip | |
iceboxadmin is now using IceBoxAdmin.ServiceManager.Proxy
Diffstat (limited to 'cpp/test/IceStorm/federation/run.py')
| -rwxr-xr-x | cpp/test/IceStorm/federation/run.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index c7763662b2b..4920a9b2436 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -28,14 +28,17 @@ iceBox = TestUtil.getIceBox(testdir) iceBoxAdmin = os.path.join(toplevel, "bin", "iceboxadmin") iceStormAdmin = os.path.join(toplevel, "bin", "icestormadmin") -iceBoxEndpoints = ' --IceBox.ServiceManager.Endpoints="default -p 12010" --Ice.Default.Locator=' - iceStormService = " --IceBox.Service.IceStorm=IceStormService," + TestUtil.getIceSoVersion() + ":createIceStorm" + \ ' --IceStorm.TopicManager.Endpoints="default -p 12011"' + \ ' --IceStorm.Publish.Endpoints="default"' + \ " --IceBox.PrintServicesReady=IceStorm" + \ - " --IceBox.InheritProperties=1" -iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager: default -p 12011"' + " --IceBox.InheritProperties=1" + \ + ' --Ice.Admin.Endpoints="default -p 12010"' + \ + " --Ice.Admin.InstanceName=IceBox" + +serviceManagerProxy = ' --IceBoxAdmin.ServiceManager.Proxy="IceBox/admin -f IceBox.ServiceManager:default -p 12010"' + +iceStormReference = ' --IceStorm.TopicManager.Proxy="IceStorm/TopicManager:default -p 12011"' def doTest(batch): global testdir @@ -79,7 +82,7 @@ TestUtil.cleanDbDir(dbHome) iceStormDBEnv=" --Freeze.DbEnv.IceStorm.DbHome=" + dbHome print "starting icestorm service...", -command = iceBox + TestUtil.clientServerOptions + iceBoxEndpoints + iceStormService + iceStormDBEnv +command = iceBox + TestUtil.clientServerOptions + iceStormService + iceStormDBEnv if TestUtil.debug: print "(" + command + ")", iceBoxPipe = os.popen(command + " 2>&1") @@ -133,7 +136,7 @@ print "ok" # Shutdown icestorm. # print "shutting down icestorm service...", -command = iceBoxAdmin + TestUtil.clientOptions + iceBoxEndpoints + r' shutdown' +command = iceBoxAdmin + TestUtil.clientOptions + serviceManagerProxy + r' shutdown' if TestUtil.debug: print "(" + command + ")", iceBoxAdminPipe = os.popen(command + " 2>&1") |