summaryrefslogtreecommitdiff
path: root/js/test/Ice/ami/Client.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/test/Ice/ami/Client.js')
-rw-r--r--js/test/Ice/ami/Client.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/js/test/Ice/ami/Client.js b/js/test/Ice/ami/Client.js
index 3f8e50b3399..402418707e3 100644
--- a/js/test/Ice/ami/Client.js
+++ b/js/test/Ice/ami/Client.js
@@ -499,13 +499,22 @@
return promise;
}
- var run = function(out, id)
+ exports.__test__ = function(out, id)
{
var communicator = Ice.initialize(id);
return Promise.try(
function()
{
- return allTests(communicator, out);
+ if(isSafari() && isWorker())
+ {
+ out.writeLine("Test not supported with Safari web workers.");
+ return Test.TestIntfPrx.uncheckedCast(
+ communicator.stringToProxy("test:default -p 12010")).shutdown();
+ }
+ else
+ {
+ return allTests(communicator, out);
+ }
}
).finally(
function()
@@ -514,7 +523,6 @@
}
);
};
- exports.__test__ = run;
exports.__runServer__ = true;
}
(typeof(global) !== "undefined" && typeof(global.process) !== "undefined" ? module : undefined,