diff options
| author | Jose <jose@zeroc.com> | 2009-12-09 17:55:04 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2009-12-09 17:55:04 +0100 |
| commit | 5f56433f8f47efe1f73c873e5fa5b490112694d8 (patch) | |
| tree | 08cd4e1e43cfeb1f5238a686f01ea387e80ff138 /cpp | |
| parent | Removed -ftemplate-depth-128 from all GCC builds (diff) | |
| download | ice-5f56433f8f47efe1f73c873e5fa5b490112694d8.tar.bz2 ice-5f56433f8f47efe1f73c873e5fa5b490112694d8.tar.xz ice-5f56433f8f47efe1f73c873e5fa5b490112694d8.zip | |
4089 - add waitTestSuccess to fileLock tests.
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/test/Freeze/fileLock/run.py | 4 | ||||
| -rwxr-xr-x | cpp/test/IceUtil/fileLock/run.py | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cpp/test/Freeze/fileLock/run.py b/cpp/test/Freeze/fileLock/run.py index a01c758ea11..c4da98ed37c 100755 --- a/cpp/test/Freeze/fileLock/run.py +++ b/cpp/test/Freeze/fileLock/run.py @@ -32,14 +32,18 @@ clientFail = os.path.join(os.getcwd(), "clientFail") clientFailExe = TestUtil.startClient(clientFail, "", None, None, False) clientFailExe.expect('File lock not acquired') +clientFailExe.waitTestSuccess() + # send some output to client to terminate it. clientExe.sendline('go') clientExe.expect('File lock released.') +clientExe.waitTestSuccess() # The lock is gone try to acquire it again. clientExe = TestUtil.startClient(client, "", None, None, False) clientExe.expect('File lock acquired.\.*') clientExe.sendline('go') clientExe.expect('File lock released.') +clientExe.waitTestSuccess() print "ok"
\ No newline at end of file diff --git a/cpp/test/IceUtil/fileLock/run.py b/cpp/test/IceUtil/fileLock/run.py index 67cf14acc21..55bda695b9c 100755 --- a/cpp/test/IceUtil/fileLock/run.py +++ b/cpp/test/IceUtil/fileLock/run.py @@ -36,11 +36,12 @@ assert(os.path.exists("file.lock")); clientFailExe = TestUtil.startClient(clientFail, "", None, None, False) clientFailExe.expect('File lock not acquired.') +clientFailExe.waitTestSuccess() # send some output to client to terminate it. clientExe.sendline('go') clientExe.expect('File lock released.') - +clientExe.waitTestSuccess() # # Ensure that the file lock was removed. # @@ -51,5 +52,5 @@ clientExe = TestUtil.startClient(client, "", None, None, False) clientExe.expect('File lock acquired.\.*') clientExe.sendline('go') clientExe.expect('File lock released.') - +clientExe.waitTestSuccess() print "ok"
\ No newline at end of file |