diff options
author | Jose <jose@zeroc.com> | 2017-02-24 16:58:47 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2017-02-24 16:58:47 +0100 |
commit | 00df474222bf89db992e8828753afea50ed2abbf (patch) | |
tree | facdb47832a2a896ccc765669bcb89c7a9a3813b /js/test/Ice/acm/Client.js | |
parent | C++11 build failure (diff) | |
download | ice-00df474222bf89db992e8828753afea50ed2abbf.tar.bz2 ice-00df474222bf89db992e8828753afea50ed2abbf.tar.xz ice-00df474222bf89db992e8828753afea50ed2abbf.zip |
Fix (ICE-7611) Do not use Promise as an alias of Ice.Promise
Diffstat (limited to 'js/test/Ice/acm/Client.js')
-rw-r--r-- | js/test/Ice/acm/Client.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/js/test/Ice/acm/Client.js b/js/test/Ice/acm/Client.js index dd257b2ba43..7e5137501e5 100644 --- a/js/test/Ice/acm/Client.js +++ b/js/test/Ice/acm/Client.js @@ -11,7 +11,6 @@ { var Ice = require("ice").Ice; var Test = require("Test").Test; - var Promise = Ice.Promise; var test = function(b) { @@ -161,10 +160,10 @@ { test(false); } - return Promise.resolve(); + return Ice.Promise.resolve(); }) } - return Promise.resolve(); + return Ice.Promise.resolve(); } runTestCase(adapter, proxy) @@ -374,7 +373,7 @@ runTestCase(adapter, proxy) { - var p = Promise.resolve(); + var p = Ice.Promise.resolve(); // Use this function so we don't have a function defined // inside of a loop @@ -407,7 +406,7 @@ { function sendHeartbeats(con) { - var p = Promise.resolve(); + var p = Ice.Promise.resolve(); for(var i = 0; i < 5; ++i) { p = p.then(con.heartbeat()); @@ -510,7 +509,7 @@ { id.properties.setProperty("Ice.Warn.Connections", "0"); var c = Ice.initialize(id); - return Promise.try(() => allTests(out, c)).finally(() => c.destroy()); + return Ice.Promise.try(() => allTests(out, c)).finally(() => c.destroy()); }; exports._test = run; exports._runServer = true; |