diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2002-07-30 19:43:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2002-07-30 19:43:11 +0000 |
| commit | 76baf7376604b5e288cef34b5262faf6bdfadb38 (patch) | |
| tree | 47d1d483f270d7742d3470067fd1c234b9e3d72f /cpp | |
| parent | fixes (diff) | |
| download | ice-76baf7376604b5e288cef34b5262faf6bdfadb38.tar.bz2 ice-76baf7376604b5e288cef34b5262faf6bdfadb38.tar.xz ice-76baf7376604b5e288cef34b5262faf6bdfadb38.zip | |
Fix to get IceBox shutdown properly again.
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/IceStorm/federation/run.py | 3 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/federation2/run.py | 3 | ||||
| -rwxr-xr-x | cpp/test/IceStorm/single/run.py | 3 | ||||
| -rwxr-xr-x | cpp/test/Yellow/basicYellow/run.py | 3 |
4 files changed, 4 insertions, 8 deletions
diff --git a/cpp/test/IceStorm/federation/run.py b/cpp/test/IceStorm/federation/run.py index 665df888c2b..cb821a2f779 100755 --- a/cpp/test/IceStorm/federation/run.py +++ b/cpp/test/IceStorm/federation/run.py @@ -33,7 +33,6 @@ updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"' -iceBoxReference=' --IceBox.ServiceManager="ServiceManager: default -p 12345"' iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \ @@ -168,7 +167,7 @@ print "ok" # Shutdown icestorm. # print "shutting down icestorm service...", -command = iceBoxAdmin + updatedClientOptions + iceBoxReference + r' shutdown' +command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown' iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: diff --git a/cpp/test/IceStorm/federation2/run.py b/cpp/test/IceStorm/federation2/run.py index 96aa71dcb24..d4c2bd8d3af 100755 --- a/cpp/test/IceStorm/federation2/run.py +++ b/cpp/test/IceStorm/federation2/run.py @@ -33,7 +33,6 @@ updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"' -iceBoxReference=' --IceBox.ServiceManager="ServiceManager: default -p 12345"' iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \ @@ -163,7 +162,7 @@ print "ok" # Shutdown icestorm. # print "shutting down icestorm service...", -command = iceBoxAdmin + updatedClientOptions + iceBoxReference + r' shutdown' +command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown' iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index ecf13ec84d5..762ff06609d 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -33,7 +33,6 @@ updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) iceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"' -iceBoxReference=' --IceBox.ServiceManager="ServiceManager: default -p 12345"' iceStormService=" --IceBox.Service.IceStorm=IceStormService:create" + \ ' --IceStorm.TopicManager.Endpoints="default -p 12346"' + \ @@ -130,7 +129,7 @@ print "ok" # Shutdown icestorm. # print "shutting down icestorm service...", -command = iceBoxAdmin + updatedClientOptions + iceBoxReference + r' shutdown' +command = iceBoxAdmin + updatedClientOptions + iceBoxEndpoints + r' shutdown' iceBoxAdminPipe = os.popen(command) iceBoxAdminStatus = iceBoxAdminPipe.close() if iceBoxAdminStatus: diff --git a/cpp/test/Yellow/basicYellow/run.py b/cpp/test/Yellow/basicYellow/run.py index fb24061df4a..177614e0ac5 100755 --- a/cpp/test/Yellow/basicYellow/run.py +++ b/cpp/test/Yellow/basicYellow/run.py @@ -32,7 +32,6 @@ updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) IceBoxEndpoints=' --IceBox.ServiceManager.Endpoints="default -p 12345"' -IceBoxReference=' --IceBox.ServiceManager="ServiceManager:default -p 12345"' YellowService=" --IceBox.Service.Yellow=YellowService:create" + \ ' --Yellow.Query.Endpoints="default -p 12346" --Yellow.Admin.Endpoints="default -p 12347"' + \ ' --IceBox.PrintServicesReady=Yellow' @@ -64,7 +63,7 @@ for output in clientPipe.xreadlines(): # Shutdown yellow. # print "shutting down yellow service...", -command = IceBoxAdmin + updatedClientOptions + IceBoxReference + r' shutdown' +command = IceBoxAdmin + updatedClientOptions + IceBoxEndpoints + r' shutdown' IceBoxAdminPipe = os.popen(command) IceBoxAdminStatus = IceBoxAdminPipe.close() if IceBoxAdminStatus: |