diff options
| author | Jose <jose@zeroc.com> | 2014-07-14 20:38:36 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-07-14 20:38:36 +0200 |
| commit | 563ed664a85b9de91d4d6537e654701fdfa3eb9f (patch) | |
| tree | 6071ea301068f01d43bf71aaea65325a68070e7b | |
| parent | Ice-5123 Improve TestUtil.py watch dog thread (diff) | |
| download | ice-563ed664a85b9de91d4d6537e654701fdfa3eb9f.tar.bz2 ice-563ed664a85b9de91d4d6537e654701fdfa3eb9f.tar.xz ice-563ed664a85b9de91d4d6537e654701fdfa3eb9f.zip | |
Demo script fixes
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 2 | ||||
| -rwxr-xr-x | demoscript/IceGrid/allocate.py | 3 | ||||
| -rwxr-xr-x | demoscript/IceGrid/sessionActivation.py | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index 04e3a89613d..b16cbb5c516 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -51,7 +51,7 @@ else: sys.stdout.write("starting icegridnode... ") sys.stdout.flush() node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --IceGrid.Node.Output=db --IceGrid.Node.RedirectErrToOut --Ice.PrintAdapterReady %s' % (args)) -node.expect('IceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Node ready') +node.expect('IceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Registry.Discovery ready\nIceGrid.Node ready') print("ok") sys.stdout.write("deploying application... ") diff --git a/demoscript/IceGrid/allocate.py b/demoscript/IceGrid/allocate.py index eb47ca8ed19..9760148d506 100755 --- a/demoscript/IceGrid/allocate.py +++ b/demoscript/IceGrid/allocate.py @@ -35,7 +35,8 @@ def run(clientCmd): sys.stdout.write("starting icegridnode... ") sys.stdout.flush() node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args)) - node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Node ready') + node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready' + + '\nIceGrid.Registry.Discovery ready\nIceGrid.Node ready') print("ok") sys.stdout.write("deploying application... ") diff --git a/demoscript/IceGrid/sessionActivation.py b/demoscript/IceGrid/sessionActivation.py index 068f0052265..f1f23fcf9b9 100755 --- a/demoscript/IceGrid/sessionActivation.py +++ b/demoscript/IceGrid/sessionActivation.py @@ -34,7 +34,8 @@ def run(clientCmd): sys.stdout.write("starting icegridnode... ") sys.stdout.flush() node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args)) - node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready\nIceGrid.Node ready') + node.expect('IceGrid.Registry.Internal ready\nIceGrid.Registry.Server ready\nIceGrid.Registry.Client ready' + '\nIceGrid.Registry.Discovery ready\nIceGrid.Node ready') print("ok") sys.stdout.write("deploying application... ") |