Fixed ICE-5422 and minor testicedist.py fixes

1 files changed, 31 insertions, 10 deletions

diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py
index a1db4e57602..0ace6595fd9 100755
--- a/cpp/demo/IceStorm/replicated/expect.py
+++ b/cpp/demo/IceStorm/replicated/expect.py
@@ -50,7 +50,7 @@ else:
 
 sys.stdout.write("starting icegridnode... ")
 sys.stdout.flush()
-node = Util.spawn(Util.getIceGridNode() + ' --Ice.Config=config.grid --Ice.PrintAdapterReady %s' % (args))
+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')
 print("ok")
 
@@ -60,19 +60,29 @@ admin = Util.spawn(Util.getIceGridAdmin() + ' --Ice.Config=config.grid')
 admin.expect('>>>')
 admin.sendline("application add \'%s\'" %(desc))
 admin.expect('>>>')
+admin.sendline("server start DemoIceStorm-1")
+admin.expect('>>>')
+admin.sendline("server start DemoIceStorm-2")
+admin.expect('>>>')
+admin.sendline("server start DemoIceStorm-3")
+admin.expect('>>>')
 print("ok")
 
 sys.stdout.write("testing pub/sub... ")
 sys.stdout.flush()
 sub = Util.spawn('./subscriber --Ice.PrintAdapterReady')
 
-node.expectall([ 'Election: node 1: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3',
-                 'Election: node 2: reporting for duty in group 3:[-0-9A-Fa-f]+ with coordinator 3',
-                 'Election: node 3: reporting for duty in group 3:[-0-9A-Fa-f]+ as coordinator' ], timeout=60)
+icestorm1 = Util.watch("db/DemoIceStorm-1.out")
+icestorm2 = Util.watch("db/DemoIceStorm-2.out")
+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)
          
-node.expectall(['DemoIceStorm-3-IceStorm: Topic: time: subscribeAndGetPublisher: [-0-9A-Fa-f]+',
-                'DemoIceStorm-1-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+',
-                'DemoIceStorm-2-IceStorm: Topic: time: add replica observer: [-0-9A-Fa-f]+' ], 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)
 
 sub.expect('.* ready')
 
@@ -87,9 +97,20 @@ sub.waitTestSuccess()
 pub.kill(signal.SIGINT)
 pub.waitTestSuccess()
 
-node.expectall([ 'DemoIceStorm-1-IceStorm: Topic: time: remove replica observer: [-0-9A-Fa-f]+',
-                 'DemoIceStorm-2-IceStorm: Topic: time: remove replica observer: [-0-9A-Fa-f]+' ,
-                 'DemoIceStorm-3-IceStorm: Topic: time: unsubscribe: [-0-9A-Fa-f]+' ], timeout=60) 
+admin.sendline("server stop DemoIceStorm-1")
+admin.expect('>>>')
+admin.sendline("server stop DemoIceStorm-2")
+admin.expect('>>>')
+admin.sendline("server stop DemoIceStorm-3")
+admin.expect('>>>')
+
+icestorm1.expect('DemoIceStorm-1-IceStorm: Topic: time: remove replica observer: [-0-9A-Fa-f]+')
+icestorm2.expect('DemoIceStorm-2-IceStorm: Topic: time: remove replica observer: [-0-9A-Fa-f]+')
+icestorm3.expect('DemoIceStorm-3-IceStorm: Topic: time: unsubscribe: [-0-9A-Fa-f]+')
+
+icestorm1.terminate()
+icestorm2.terminate()
+icestorm3.terminate()
 
 admin.sendline('registry shutdown Master')
 admin.sendline('exit')