diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2008-04-04 13:37:01 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2008-04-04 13:37:01 -0230 |
| commit | 3297a674cd0d6fd08246734cdc5270f3843e4262 (patch) | |
| tree | 39656f7ae1dbb7d65e1792431c2f9b50820a2a70 /cpp/demo/IceStorm/replicated/expect.py | |
| parent | Modified C++Builder compiler name (diff) | |
| download | ice-3297a674cd0d6fd08246734cdc5270f3843e4262.tar.bz2 ice-3297a674cd0d6fd08246734cdc5270f3843e4262.tar.xz ice-3297a674cd0d6fd08246734cdc5270f3843e4262.zip | |
Fixed some expect scripts
Diffstat (limited to 'cpp/demo/IceStorm/replicated/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index 849a7dfc34e..723c0095d8a 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -76,13 +76,13 @@ def matchpat(e, pat, timeout=60): matched.append(m) assert len(matched) == len(pat) -matchpat(node, [ 'Election: node 1: reporting for duty in group 3:[-0-9A-F]+ with coordinator 3', - 'Election: node 2: reporting for duty in group 3:[-0-9A-F]+ with coordinator 3', - 'Election: node 3: reporting for duty in group 3:[-0-9A-F]+ as coordinator' ]) +matchpat(node, [ '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' ]) -matchpat(node, ['DemoIceStorm-3: Topic: time: subscribeAndGetPublisher: [-0-9A-F]+', - 'DemoIceStorm-1: Topic: time: add replica observer: [-0-9A-F]+', - 'DemoIceStorm-2: Topic: time: add replica observer: [-0-9A-F]+' ]) +matchpat(node, ['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]+' ]) sub.expect('.* ready') @@ -97,9 +97,9 @@ sub.waitTestSuccess() pub.kill(signal.SIGINT) pub.waitTestSuccess() -matchpat(node, [ 'DemoIceStorm-1: Topic: time: remove replica observer: [-0-9A-F]+', - 'DemoIceStorm-2: Topic: time: remove replica observer: [-0-9A-F]+' , - 'DemoIceStorm-3: Topic: time: unsubscribe: [-0-9A-F]+' ]) +matchpat(node, [ '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]+' ]) admin.sendline('registry shutdown Master') admin.sendline('exit') |