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 | |
| 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')
| -rwxr-xr-x | cpp/demo/IceStorm/counter/expect.py | 3 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 2 | ||||
| -rw-r--r-- | cpp/demo/IceStorm/replicated2/config.ib3 | 2 | ||||
| -rwxr-xr-x | cpp/demo/IceStorm/replicated2/expect.py | 9 |
4 files changed, 10 insertions, 6 deletions
diff --git a/cpp/demo/IceStorm/counter/expect.py b/cpp/demo/IceStorm/counter/expect.py index 98e2e7c0a1f..f1255c3fd56 100755 --- a/cpp/demo/IceStorm/counter/expect.py +++ b/cpp/demo/IceStorm/counter/expect.py @@ -79,6 +79,7 @@ print("ok") server.kill(signal.SIGINT) server.waitTestSuccess() -admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.icebox shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --IceBoxAdmin.ServiceManager.Proxy="icebox/admin \ + -f IceBox.ServiceManager:tcp -p 9996 -h 127.0.0.1" shutdown') admin.waitTestSuccess() icestorm.waitTestSuccess() diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index b16cbb5c516..a4f747223de 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -79,7 +79,7 @@ icestorm3 = Util.watch("db/DemoIceStorm-3.out") icestorm1.expect('Election: node 1: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3', timeout = 60) icestorm2.expect('Election: node 2: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3', timeout = 60) icestorm3.expect('Election: node 3: reporting for duty in group 3:[-0-9A-Fa-f]+ as coordinator', timeout = 60) - + icestorm3.expect('DemoIceStorm-3-IceStorm: Topic: time: subscribeAndGetPublisher: [-0-9A-Fa-f]+', timeout = 60) icestorm1.expect('DemoIceStorm-1-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+', timeout = 60) icestorm2.expect('DemoIceStorm-2-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+', timeout = 60) diff --git a/cpp/demo/IceStorm/replicated2/config.ib3 b/cpp/demo/IceStorm/replicated2/config.ib3 index 2da9ad9d0d3..9ff9a7d9e88 100644 --- a/cpp/demo/IceStorm/replicated2/config.ib3 +++ b/cpp/demo/IceStorm/replicated2/config.ib3 @@ -1,7 +1,7 @@ # # Enable Ice.Admin object # -Ice.Admin.Endpoints=tcp -p 9993 +Ice.Admin.Endpoints=tcp -p 9992 Ice.Admin.InstanceName=icebox3 # 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() |