diff options
Diffstat (limited to 'cpp/demo/IceStorm/replicated/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index aa8c85bba0e..0a92a007ae0 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -32,7 +32,7 @@ if demoscript.Util.mode == 'debug': desc = 'tmp_application.xml' fo = open(desc, "w") for l in fi: - if l.find('exe="icebox"'): + if l.find('exe="icebox"') != -1: l = l.replace('exe="icebox"', 'exe="iceboxd.exe"') fo.write(l) fi.close() @@ -97,9 +97,11 @@ sub.waitTestSuccess() pub.kill(signal.SIGINT) pub.waitTestSuccess() -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]+' ]) +# With Cygwin SIGINT isn't intercepted. +if not demoscript.Util.isCygwin(): + 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') |