summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-07-20 13:59:30 +0200
committerJose <jose@zeroc.com>2017-07-20 13:59:30 +0200
commit9beab4deda299d3a1100b606a5e17f8e99bb615c (patch)
tree86035485e7156c66dea9aed71e57f3325732bd60 /js
parentFix for Glacier2 es5 & workers (diff)
downloadice-9beab4deda299d3a1100b606a5e17f8e99bb615c.tar.bz2
ice-9beab4deda299d3a1100b606a5e17f8e99bb615c.tar.xz
ice-9beab4deda299d3a1100b606a5e17f8e99bb615c.zip
ICE-8367 - Browser glacier2/router hang on shutdown
Diffstat (limited to 'js')
-rw-r--r--js/test/Glacier2/router/Client.js7
1 files changed, 3 insertions, 4 deletions
diff --git a/js/test/Glacier2/router/Client.js b/js/test/Glacier2/router/Client.js
index 5dde0d2720b..82971ae66c0 100644
--- a/js/test/Glacier2/router/Client.js
+++ b/js/test/Glacier2/router/Client.js
@@ -351,7 +351,7 @@
out.writeLine("ok");
out.write("testing stringToProxy for process object... ");
- processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -h 127.0.0.1 -p 12021");
+ processBase = communicator.stringToProxy("Glacier2/admin -f Process:default -p 12021");
out.writeLine("ok");
out.write("testing checked cast for admin object... ");
@@ -368,7 +368,7 @@
).then(
function()
{
- return processPrx.ice_ping();
+ return processPrx.ice_timeout(500).ice_ping();
}
).then(
failCB,
@@ -376,8 +376,7 @@
{
test(ex instanceof Ice.LocalException);
out.writeLine("ok");
- }
- );
+ });
}
}
);