diff options
| author | Joe George <joe@zeroc.com> | 2014-11-10 16:16:01 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2014-11-10 16:18:04 -0500 |
| commit | f1de3652d8394ad3cd76b4986d0fc1c6e8d40524 (patch) | |
| tree | dd52040544acd72fd9d6a9a8f31323a47786b318 /js/test/Common/run.py | |
| parent | Minor cleanup of slice2freezej task configurations (diff) | |
| download | ice-f1de3652d8394ad3cd76b4986d0fc1c6e8d40524.tar.bz2 ice-f1de3652d8394ad3cd76b4986d0fc1c6e8d40524.tar.xz ice-f1de3652d8394ad3cd76b4986d0fc1c6e8d40524.zip | |
ICE-5860 - Fix IceJS browser tests causing WatchDog thread to complain.
Diffstat (limited to 'js/test/Common/run.py')
| -rwxr-xr-x | js/test/Common/run.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/js/test/Common/run.py b/js/test/Common/run.py index a0975bf303f..974fb085470 100755 --- a/js/test/Common/run.py +++ b/js/test/Common/run.py @@ -41,7 +41,7 @@ if "NODE" in os.environ: else: for path in os.environ["PATH"].split(os.pathsep): # - # Stop if we find "php" in the PATH first. + # Stop if we find "node" in the PATH first. # if os.path.exists(os.path.join(path, "node")): break @@ -65,6 +65,9 @@ class ServerI(Test.Server): current.adapter.remove(current.id) except: pass + # Stop the WatchDog thread since we may not run any more tests + # for an extended period of time + TestUtil.stopWatchDog() print("ok") def terminate(self, current): @@ -78,6 +81,9 @@ class ServerI(Test.Server): current.adapter.remove(current.id) except: pass + # Stop the WatchDog thread since we may not run any more tests + # for an extended period of time + TestUtil.stopWatchDog() print("ok") class ControllerI(Test.Controller): |