diff options
| author | Joe George <joe@zeroc.com> | 2014-10-15 15:42:10 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-10-15 15:44:04 -0400 |
| commit | 683ef72bfe5ea002a366291c6f7d5aaab811c8c3 (patch) | |
| tree | 446dc9d20715657ba3dfba2f280c3ff89a1ba12a /cpp/demo/IceStorm/replicated2/expect.py | |
| parent | minor style fixes (diff) | |
| download | ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.tar.bz2 ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.tar.xz ice-683ef72bfe5ea002a366291c6f7d5aaab811c8c3.zip | |
Fix ICE-5745 - IceStorm demos were not properly shutting down from scripts
Diffstat (limited to 'cpp/demo/IceStorm/replicated2/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated2/expect.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py index b42877a6efc..57f592df516 100755 --- a/cpp/demo/IceStorm/replicated2/expect.py +++ b/cpp/demo/IceStorm/replicated2/expect.py @@ -82,11 +82,14 @@ ib1.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+') ib2.expect('Topic: time: remove replica observer: [-0-9A-Fa-f]+') ib3.expect('Topic: time: unsubscribe: [-0-9A-Fa-f]+') -admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib1 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox1/admin \ + -f IceBox.ServiceManager:tcp -p 9990 -h 127.0.0.1" shutdown') admin.waitTestSuccess() -admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib2 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox2/admin \ + -f IceBox.ServiceManager:tcp -p 9991 -h 127.0.0.1" shutdown') admin.waitTestSuccess() -admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib3 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox3/admin \ + -f IceBox.ServiceManager:tcp -p 9992 -h 127.0.0.1" shutdown') admin.waitTestSuccess() ib1.waitTestSuccess() |