summaryrefslogtreecommitdiff
path: root/js/test/Ice/acm/Client.js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-07-04 15:45:11 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-07-04 15:45:11 +0200
commit728a685f8e5d7d72bdba08916baedb7395fd97a1 (patch)
treefd852a592764a25db4461a67779bbb0e3927325d /js/test/Ice/acm/Client.js
parentFixed JS code to align with C++/Java/C# collocation optimization changes, sup... (diff)
downloadice-728a685f8e5d7d72bdba08916baedb7395fd97a1.tar.bz2
ice-728a685f8e5d7d72bdba08916baedb7395fd97a1.tar.xz
ice-728a685f8e5d7d72bdba08916baedb7395fd97a1.zip
Disabled ACM test for IE which doesn't allow more than 6 connections
Diffstat (limited to 'js/test/Ice/acm/Client.js')
-rw-r--r--js/test/Ice/acm/Client.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js
index 8749d1afac1..472eb465387 100644
--- a/js/test/Ice/acm/Client.js
+++ b/js/test/Ice/acm/Client.js
@@ -429,6 +429,16 @@
var allTests = function(out, communicator)
{
+ //
+ // Skip this test with IE it open too many connections IE doesn't allow more
+ // than 6 connections.
+ //
+ if(typeof(navigator) !== "undefined" &&
+ (navigator.userAgent.indexOf("MSIE") !== -1 || navigator.userAgent.indexOf("Trident/7.0")))
+ {
+ return;
+ }
+
var ref = "communicator:default -p 12010";
var com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref));
@@ -447,7 +457,7 @@
tests.push(new HeartbeatAlwaysTest(com, out));
tests.push(new SetACMTest(com, out));
- var promises = [];
+ var promises = [];
for(var test in tests)
{
promises.push(tests[test].init());