diff options
| author | Joe George <joe@zeroc.com> | 2014-11-16 20:05:08 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-11-16 20:05:52 -0500 |
| commit | 93fe084d8136d8e2649f20a6bc5c4627445aedc4 (patch) | |
| tree | a40b03c04c61d403db6b3445629415eb0145e595 /cpp/demo/IceStorm/replicated/expect.py | |
| parent | Ubuntu package updates (diff) | |
| download | ice-93fe084d8136d8e2649f20a6bc5c4627445aedc4.tar.bz2 ice-93fe084d8136d8e2649f20a6bc5c4627445aedc4.tar.xz ice-93fe084d8136d8e2649f20a6bc5c4627445aedc4.zip | |
ICE-5904 - Fix IceStorm/replicated failure
Diffstat (limited to 'cpp/demo/IceStorm/replicated/expect.py')
| -rwxr-xr-x | cpp/demo/IceStorm/replicated/expect.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/demo/IceStorm/replicated/expect.py b/cpp/demo/IceStorm/replicated/expect.py index a4f747223de..f6da746197a 100755 --- a/cpp/demo/IceStorm/replicated/expect.py +++ b/cpp/demo/IceStorm/replicated/expect.py @@ -43,6 +43,14 @@ Util.cleanDbDir("db/node") Util.cleanDbDir("db/registry") print("ok") +sys.stdout.write("cleaning old log files... ") +for f in ["db/DemoIceStorm-1.out", "db/DemoIceStorm-2.out", "db/DemoIceStorm-3.out"]: + try: + os.remove(f) + except: + pass +print("ok") + if Util.defaultHost: args = ' --IceGrid.Node.PropertiesOverride="Ice.Default.Host=127.0.0.1"' else: @@ -92,6 +100,7 @@ time.sleep(3) sub.expect('[0-9][0-9]/[0-9][0-9].*\n[0-9][0-9]/[0-9][0-9]') print("ok") +sys.stdout.write("shutting down... ") sub.kill(signal.SIGINT) sub.waitTestSuccess() pub.kill(signal.SIGINT) @@ -116,3 +125,4 @@ admin.sendline('registry shutdown Master') admin.sendline('exit') admin.waitTestSuccess() node.waitTestSuccess() +print("ok") |