diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 09:35:28 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-02 09:35:28 -0230 |
| commit | 6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0 (patch) | |
| tree | ff37056717cff166bc705112f54e98074f8d1f40 /cpp/demo/IceStorm/replicated2/expect.py | |
| parent | 3772. Recovering from Glacier2 / Ice router session failure. (diff) | |
| download | ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.tar.bz2 ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.tar.xz ice-6d8d16b3761eaa24c9c754dd0f2cc1a70de8fad0.zip | |
C++Builder 2010 support
Diffstat (limited to 'cpp/demo/IceStorm/replicated2/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated2/expect.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/demo/IceStorm/replicated2/expect.py b/cpp/demo/IceStorm/replicated2/expect.py index 344bee9118b..2166671e684 100755 --- a/cpp/demo/IceStorm/replicated2/expect.py +++ b/cpp/demo/IceStorm/replicated2/expect.py @@ -30,11 +30,11 @@ Util.cleanDbDir("db3") print "ok" if Util.defaultHost: - a1 = ' --IceBox.Service.IceStorm="IceStormService,33:createIceStorm --Ice.Config=config.s1 %s"' \ + a1 = ' --IceBox.Service.IceStorm="IceStormService,34b:createIceStorm --Ice.Config=config.s1 %s"' \ % Util.defaultHost - a2 = ' --IceBox.Service.IceStorm="IceStormService,33:createIceStorm --Ice.Config=config.s2 %s"' \ + a2 = ' --IceBox.Service.IceStorm="IceStormService,34b:createIceStorm --Ice.Config=config.s2 %s"' \ % Util.defaultHost - a3 = ' --IceBox.Service.IceStorm="IceStormService,33:createIceStorm --Ice.Config=config.s3 %s"' \ + a3 = ' --IceBox.Service.IceStorm="IceStormService,34b:createIceStorm --Ice.Config=config.s3 %s"' \ % Util.defaultHost else: a1 = '' @@ -82,10 +82,10 @@ 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('iceboxadmin --Ice.Config=config.ib1 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib1 shutdown') admin.waitTestSuccess() -admin = Util.spawn('iceboxadmin --Ice.Config=config.ib2 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib2 shutdown') admin.waitTestSuccess() -admin = Util.spawn('iceboxadmin --Ice.Config=config.ib3 shutdown') +admin = Util.spawn(Util.getIceBoxAdmin() + ' --Ice.Config=config.ib3 shutdown') admin.waitTestSuccess() print "ok" |