Minor timeout test fix to prevent failure, fixes #498

5 files changed, 6 insertions, 78 deletions

diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index b7fd8643344..b6bde584ec2 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -522,28 +522,9 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control
 
         // Keep the server thread pool busy.
 #ifdef ICE_CPP11_MAPPING
-        timeout->ice_invocationTimeout(-1)->sleepAsync(300);
+        timeout->ice_invocationTimeout(-1)->sleepAsync(500);
 #else
-        timeout->ice_invocationTimeout(-1)->begin_sleep(300);
-#endif
-        try
-        {
-            batchTimeout->ice_flushBatchRequests();
-            test(false);
-        }
-        catch(const Ice::InvocationTimeoutException&)
-        {
-        }
-
-        batchTimeout->ice_ping();
-        batchTimeout->ice_ping();
-        batchTimeout->ice_ping();
-
-        // Keep the server thread pool busy.
-#ifdef ICE_CPP11_MAPPING
-        timeout->ice_invocationTimeout(-1)->sleepAsync(300);
-#else
-        timeout->ice_invocationTimeout(-1)->begin_sleep(300);
+        timeout->ice_invocationTimeout(-1)->begin_sleep(500);
 #endif
         try
         {
diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs
index 3aa37e59f92..3f5b4a5ba99 100644
--- a/csharp/test/Ice/timeout/AllTests.cs
+++ b/csharp/test/Ice/timeout/AllTests.cs
@@ -481,21 +481,7 @@ namespace Ice
                     batchTimeout.ice_ping();
                     batchTimeout.ice_ping();
 
-                   ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
-                    try
-                    {
-                        batchTimeout.ice_flushBatchRequests();
-                        test(false);
-                    }
-                    catch(Ice.InvocationTimeoutException)
-                    {
-                    }
-
-                    batchTimeout.ice_ping();
-                    batchTimeout.ice_ping();
-                    batchTimeout.ice_ping();
-
-                   ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
+                    ((Test.TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(500); // Keep the server thread pool busy.
                     try
                     {
                         batchTimeout.end_ice_flushBatchRequests(batchTimeout.begin_ice_flushBatchRequests());
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 569281cabf5..ccc71c83aeb 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
@@ -577,21 +577,7 @@ public class AllTests
             batchTimeout.ice_ping();
             batchTimeout.ice_ping();
 
-            ((TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
-            try
-            {
-                batchTimeout.ice_flushBatchRequests();
-                test(false);
-            }
-            catch(Ice.InvocationTimeoutException ex)
-            {
-            }
-
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-
-            ((TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(300); // Keep the server thread pool busy.
+            ((TimeoutPrx)proxy.ice_invocationTimeout(-1)).begin_sleep(500); // Keep the server thread pool busy.
             try
             {
                 batchTimeout.end_ice_flushBatchRequests(batchTimeout.begin_ice_flushBatchRequests());
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 80f99bc89c8..80198c0e85c 100644
--- a/java/test/src/main/java/test/Ice/timeout/AllTests.java
+++ b/java/test/src/main/java/test/Ice/timeout/AllTests.java
@@ -510,22 +510,7 @@ public class AllTests
             batchTimeout.ice_ping();
             batchTimeout.ice_ping();
             batchTimeout.ice_ping();
-
-            proxy.ice_invocationTimeout(-1).sleepAsync(300); // Keep the server thread pool busy.
-            try
-            {
-                batchTimeout.ice_flushBatchRequests();
-                test(false);
-            }
-            catch(com.zeroc.Ice.InvocationTimeoutException ex)
-            {
-            }
-
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-            batchTimeout.ice_ping();
-
-            proxy.ice_invocationTimeout(-1).sleepAsync(300); // Keep the server thread pool busy.
+            proxy.ice_invocationTimeout(-1).sleepAsync(500); // Keep the server thread pool busy.
             try
             {
                 batchTimeout.ice_flushBatchRequestsAsync().join();
diff --git a/swift/test/Ice/timeout/AllTests.swift b/swift/test/Ice/timeout/AllTests.swift
index 996fee0536d..35dfc8e8146 100644
--- a/swift/test/Ice/timeout/AllTests.swift
+++ b/swift/test/Ice/timeout/AllTests.swift
@@ -358,17 +358,7 @@ public func allTestsWithController(helper: TestHelper, controller: ControllerPrx
         try batchTimeout.ice_ping()
         try batchTimeout.ice_ping()
 
-        _ = proxy.ice_invocationTimeout(-1).sleepAsync(300) // Keep the server thread pool busy.
-        do {
-            try batchTimeout.ice_flushBatchRequests()
-            try test(false)
-        } catch is Ice.InvocationTimeoutException {}
-
-        try batchTimeout.ice_ping()
-        try batchTimeout.ice_ping()
-        try batchTimeout.ice_ping()
-
-        _ = proxy.ice_invocationTimeout(-1).sleepAsync(300) // Keep the server thread pool busy.
+        _ = proxy.ice_invocationTimeout(-1).sleepAsync(500) // Keep the server thread pool busy.
         do {
             try batchTimeout.ice_flushBatchRequestsAsync().wait()
             try test(false)