diff options
| author | Jose <jose@zeroc.com> | 2009-11-05 02:24:25 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-11-05 02:24:25 +0100 |
| commit | d1c25f6a6226bba0c92a769d68ebffa22fc952dc (patch) | |
| tree | 883fe5965747a0090b67b2f703d2cac41b86ebdc /cpp/demo/IceStorm/replicated/expect.py | |
| parent | bug 2589: (diff) | |
| download | ice-d1c25f6a6226bba0c92a769d68ebffa22fc952dc.tar.bz2 ice-d1c25f6a6226bba0c92a769d68ebffa22fc952dc.tar.xz ice-d1c25f6a6226bba0c92a769d68ebffa22fc952dc.zip | |
IceStorm expect.py was broken by new logger prefix.
Diffstat (limited to 'cpp/demo/IceStorm/replicated/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index 6390af3f0ba..13bce76912f 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -70,9 +70,9 @@ node.expectall([ 'Election: node 1: reporting for duty in group 3:[-0-9A-Fa-f]+ '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) -node.expectall(['DemoIceStorm-3: Topic: time: subscribeAndGetPublisher: [-0-9A-Fa-f]+', - 'DemoIceStorm-1: Topic: time: add replica observer: [-0-9A-Fa-f]+', - 'DemoIceStorm-2: Topic: time: add replica observer: [-0-9A-Fa-f]+' ], 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) sub.expect('.* ready') @@ -87,9 +87,9 @@ sub.waitTestSuccess() pub.kill(signal.SIGINT) pub.waitTestSuccess() -node.expectall([ 'DemoIceStorm-1: Topic: time: remove replica observer: [-0-9A-Fa-f]+', - 'DemoIceStorm-2: Topic: time: remove replica observer: [-0-9A-Fa-f]+' , - 'DemoIceStorm-3: Topic: time: unsubscribe: [-0-9A-Fa-f]+' ], timeout=60) +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('registry shutdown Master') admin.sendline('exit') |