summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-03-29 21:40:30 +0200
committerBenoit Foucher <benoit@zeroc.com>2016-03-29 21:40:30 +0200
commit6d467b8e949c8db5cc732fce69e9988f46cceb67 (patch)
tree466cbd83c14c598ddb53e0691d29cac50a8bd58e
parentFixed ICE-7050: fixed WSS issue where server could stop reading requests (diff)
downloadice-6d467b8e949c8db5cc732fce69e9988f46cceb67.tar.bz2
ice-6d467b8e949c8db5cc732fce69e9988f46cceb67.tar.xz
ice-6d467b8e949c8db5cc732fce69e9988f46cceb67.zip
Disabled binding test on Safari + WebWorkers
-rw-r--r--js/test/Ice/binding/Client.js18
1 files changed, 16 insertions, 2 deletions
diff --git a/js/test/Ice/binding/Client.js b/js/test/Ice/binding/Client.js
index fdf01f51ed2..c44e07a3a75 100644
--- a/js/test/Ice/binding/Client.js
+++ b/js/test/Ice/binding/Client.js
@@ -1165,8 +1165,22 @@
return p;
};
- exports.__test__ = run;
- exports.__runServer__ = true;
+ if(typeof(navigator) !== 'undefined' && isSafari() && isWorker())
+ {
+ //
+ // With Safari 9.1 and WebWorkers, this test hangs in communicator destruction. The
+ // web socket send() method never returns for the sending of close connection message.
+ //
+ exports.__test__ = function(out, id)
+ {
+ out.writeLine("Test not supported with Safari web workers.");
+ }
+ }
+ else
+ {
+ exports.__test__ = run;
+ exports.__runServer__ = true;
+ }
}
(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,
typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? require : this.Ice.__require,