diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-07-14 15:39:12 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-07-14 15:39:12 -0230 |
| commit | 780df6acece64ec9e29ec42bca0242afc0b5d793 (patch) | |
| tree | 07043fe31f20de8047e4e2f40b18ca8219573c24 /scripts/TestUtil.py | |
| parent | ICE-5462 library demo doesn't validate input data (diff) | |
| download | ice-780df6acece64ec9e29ec42bca0242afc0b5d793.tar.bz2 ice-780df6acece64ec9e29ec42bca0242afc0b5d793.tar.xz ice-780df6acece64ec9e29ec42bca0242afc0b5d793.zip | |
Ice-5123 Improve TestUtil.py watch dog thread
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 2667349bcef..af626c73bc0 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1320,7 +1320,9 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "", client = getCommandLine(client, clientCfg, additionalClientOptions) clientProc = spawnClient(client, env = clientenv, startReader = False, lang=clientCfg.lang) print("ok") - clientProc.startReader() + + global watchDog + clientProc.startReader(watchDog) clientProc.waitTestSuccess() serverProc.waitTestSuccess() @@ -1353,7 +1355,9 @@ def collocatedTest(additionalOptions = ""): collocated = getCommandLine(collocated, DriverConfig("colloc"), additionalOptions) collocatedProc = spawnClient(collocated, env = env, startReader = False, lang=lang) print("ok") - collocatedProc.startReader() + + global watchDog + collocatedProc.startReader(watchDog) collocatedProc.waitTestSuccess() if appverifier: appVerifierAfterTestEnd([exe]) |