summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-09-18 22:26:02 +0200
committerJose <jose@zeroc.com>2019-09-18 22:34:34 +0200
commitd4c51c4dd3d5db99dac85c9dcd49b8305236df2e (patch)
tree6d03986e64b31c3c00f640013b82773f40b82d3d /js
parentRemoved copyright year (diff)
downloadice-d4c51c4dd3d5db99dac85c9dcd49b8305236df2e.tar.bz2
ice-d4c51c4dd3d5db99dac85c9dcd49b8305236df2e.tar.xz
ice-d4c51c4dd3d5db99dac85c9dcd49b8305236df2e.zip
Fix js Ice/adapterDeactivation failure - Close #534
Diffstat (limited to 'js')
-rw-r--r--js/test/Ice/adapterDeactivation/Client.js3
-rw-r--r--js/test/typescript/Ice/adapterDeactivation/Client.ts3
2 files changed, 4 insertions, 2 deletions
diff --git a/js/test/Ice/adapterDeactivation/Client.js b/js/test/Ice/adapterDeactivation/Client.js
index 645a0c67df1..cdb70ca9d84 100644
--- a/js/test/Ice/adapterDeactivation/Client.js
+++ b/js/test/Ice/adapterDeactivation/Client.js
@@ -156,7 +156,8 @@
}
catch(ex)
{
- test(ex instanceof Ice.ConnectFailedException);
+ test(ex instanceof Ice.ConnectFailedException ||
+ ex instanceof Ice.ConnectTimeoutException);
}
}
out.writeLine("ok");
diff --git a/js/test/typescript/Ice/adapterDeactivation/Client.ts b/js/test/typescript/Ice/adapterDeactivation/Client.ts
index df0456328c1..133cc457ce4 100644
--- a/js/test/typescript/Ice/adapterDeactivation/Client.ts
+++ b/js/test/typescript/Ice/adapterDeactivation/Client.ts
@@ -153,7 +153,8 @@ export class Client extends TestHelper
}
catch(ex)
{
- test(ex instanceof Ice.ConnectFailedException);
+ test(ex instanceof Ice.ConnectFailedException ||
+ ex instanceof Ice.ConnectTimeoutException);
}
}
out.writeLine("ok");