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/IceGrid/secure/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/IceGrid/secure/expect.py')
| -rwxr-xr-x | cpp/demo/IceGrid/secure/expect.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/demo/IceGrid/secure/expect.py b/cpp/demo/IceGrid/secure/expect.py index f53a592eb38..e2da0b55107 100755 --- a/cpp/demo/IceGrid/secure/expect.py +++ b/cpp/demo/IceGrid/secure/expect.py @@ -75,9 +75,9 @@ print "ok" print "starting icegrid...", sys.stdout.flush() registryProps = " --Ice.PrintAdapterReady" -registry = Util.spawn('icegridregistry --Ice.Config=config.registry' + registryProps) +registry = Util.spawn(Util.getIceGridRegistry() + ' --Ice.Config=config.registry' + registryProps) registry.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready') -node = Util.spawn('icegridnode --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args)) +node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.node --Ice.PrintAdapterReady %s' % (args)) node.expect('IceGrid.Node ready') print "ok" @@ -85,14 +85,14 @@ print "starting glacier2...", sys.stdout.flush() glacier2Props = " --Ice.PrintAdapterReady --Glacier2.SessionTimeout=5" -glacier2 = Util.spawn('glacier2router --Ice.Config=config.glacier2' + glacier2Props) +glacier2 = Util.spawn(Util.getGlacier2Router() + ' --Ice.Config=config.glacier2' + glacier2Props) glacier2.expect('Glacier2.Client ready') glacier2.expect('Glacier2.Server ready') print "ok" print "deploying application...", sys.stdout.flush() -admin = Util.spawn('icegridadmin --Ice.Config=config.admin') +admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.admin') admin.expect('>>>') admin.sendline("application add application.xml") admin.expect('>>>') @@ -121,7 +121,7 @@ print "ok" print "completing shutdown...", sys.stdout.flush() -admin = Util.spawn('icegridadmin --Ice.Config=config.admin') +admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.admin') admin.expect('>>>') admin.sendline('node shutdown Node') |