summaryrefslogtreecommitdiff
path: root/js/test/Ice/timeout/Client.js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2018-12-18 11:45:06 +0100
committerJose <jose@zeroc.com>2018-12-18 11:45:06 +0100
commitc5eb3b424cd3b516689a64087534ba4b36dd24b6 (patch)
treebd69b17797e85a5961281710b254ac682577cf2e /js/test/Ice/timeout/Client.js
parentCheck for bin/<arch> directory when running tests, fixes #125 (diff)
downloadice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.tar.bz2
ice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.tar.xz
ice-c5eb3b424cd3b516689a64087534ba4b36dd24b6.zip
JavaScript Ice/timeout extra fixes, Close #262
Diffstat (limited to 'js/test/Ice/timeout/Client.js')
-rw-r--r--js/test/Ice/timeout/Client.js7
1 files changed, 6 insertions, 1 deletions
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 05fb4aa4d68..bcdefd727d9 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -365,7 +365,12 @@
const end = Date.now();
try
{
- const t = TestHelper.isSafari() ? 30000 : mult * 2000;
+ //
+ // setTimeout can be unpredictable slow in Safari and IE when the process
+ // enter background, we increase the expected time that destroy can takes
+ // for these browsers.
+ //
+ const t = (TestHelper.isSafari() || TestHelper.isIE()) ? 30000 : mult * 2000;
test(end - start < t,
new Error(`destroy take ${end - start} ms, expected less than ${t} ms`));
}