summaryrefslogtreecommitdiff
path: root/js/test/Ice/timeout/Client.js
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-09-17 21:49:29 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-09-17 21:49:29 +0200
commitabcc3904b478a3052aa3acc982bc964616b2f6d3 (patch)
tree9e5e4cb01e0fb5a50f8308b959756d5337ee21ba /js/test/Ice/timeout/Client.js
parentFixed Python buid system to use pythonM.m-config instead of pythonMm-config (diff)
downloadice-abcc3904b478a3052aa3acc982bc964616b2f6d3.tar.bz2
ice-abcc3904b478a3052aa3acc982bc964616b2f6d3.tar.xz
ice-abcc3904b478a3052aa3acc982bc964616b2f6d3.zip
Another ICE_BIN_DIST build system fix
Diffstat (limited to 'js/test/Ice/timeout/Client.js')
-rw-r--r--js/test/Ice/timeout/Client.js19
1 files changed, 1 insertions, 18 deletions
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 80d5c2238b1..bf6b6e06906 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -7,11 +7,6 @@
//
// **********************************************************************
-/* global
- isSafari : false,
- isWorker : false
-*/
-
(function(module, require, exports)
{
var Ice = require("ice").Ice;
@@ -355,19 +350,7 @@
id.properties.setProperty("Ice.PrintStackTraces", "1");
var c = Ice.initialize(id);
- return Ice.Promise.try(() =>
- {
- if(typeof(navigator) !== 'undefined' && isSafari() && isWorker())
- {
- out.writeLine("Test not supported with Safari web workers.");
- return Test.TimeoutPrx.uncheckedCast(c.stringToProxy("controller:default -p 12010")).shutdown();
- }
- else
- {
- return allTests(out, c);
- }
- }
- ).finally(() => c.destroy());
+ return Ice.Promise.try(() => allTests(out, c)).finally(() => c.destroy());
};
exports._test = run;
exports._runServer = true;