summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2018-05-28 18:35:24 +0200
committerBenoit Foucher <benoit@zeroc.com>2018-05-28 18:35:24 +0200
commit720e09452e5a650087670231e372945adfaa56b0 (patch)
treea762b9fc00b936de596f86d7bb7c5149ab7e3e7d
parentFixed Android testing issue (diff)
downloadice-720e09452e5a650087670231e372945adfaa56b0.tar.bz2
ice-720e09452e5a650087670231e372945adfaa56b0.tar.xz
ice-720e09452e5a650087670231e372945adfaa56b0.zip
Fixed connect timeout test sporadic failures in particular with macOS/Firefox
-rw-r--r--java-compat/test/src/main/java/test/Ice/timeout/AllTests.java4
-rw-r--r--java/test/src/main/java/test/Ice/timeout/AllTests.java4
-rw-r--r--js/test/Ice/timeout/Client.js4
3 files changed, 6 insertions, 6 deletions
diff --git a/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java b/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
index 5d9bd2dd6a5..af5e7db599a 100644
--- a/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
+++ b/java-compat/test/src/main/java/test/Ice/timeout/AllTests.java
@@ -199,8 +199,8 @@ public class AllTests
// Expect success.
//
timeout.op(); // Ensure adapter is active.
- TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(1000 * mult));
- controller.holdAdapter(200 * mult);
+ TimeoutPrx to = TimeoutPrxHelper.uncheckedCast(obj.ice_timeout(2000 * mult));
+ controller.holdAdapter(100 * mult);
try
{
to.op();
diff --git a/java/test/src/main/java/test/Ice/timeout/AllTests.java b/java/test/src/main/java/test/Ice/timeout/AllTests.java
index dd950ed83a6..54aa081a183 100644
--- a/java/test/src/main/java/test/Ice/timeout/AllTests.java
+++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java
@@ -122,8 +122,8 @@ public class AllTests
//
// Expect success.
//
- TimeoutPrx to = timeout.ice_timeout(1000 * mult);
- controller.holdAdapter(200 * mult);
+ TimeoutPrx to = timeout.ice_timeout(2000 * mult);
+ controller.holdAdapter(100 * mult);
try
{
to.op();
diff --git a/js/test/Ice/timeout/Client.js b/js/test/Ice/timeout/Client.js
index 8f8e92d520b..3a05c085107 100644
--- a/js/test/Ice/timeout/Client.js
+++ b/js/test/Ice/timeout/Client.js
@@ -82,8 +82,8 @@
}
{
- const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(1000 * mult));
- await controller.holdAdapter(200 * mult);
+ const to = Test.TimeoutPrx.uncheckedCast(obj.ice_timeout(2000 * mult));
+ await controller.holdAdapter(100 * mult);
await to.ice_getConnection();
try
{