Bumped sleep time and decreased timeout, fixes #850

zeroc-ice · May 15, 2020 · 827fb61 · 827fb61
1 parent 92a82a7
commit 827fb61
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp
@@ -360,10 +360,10 @@ allTests(const Ice::CommunicatorPtr& communicator, const Ice::CommunicatorPtr& c
             // The timeout might occur on connection establishment or because of the sleep. What's
             // important here is to make sure there are 4 retries and that no calls succeed to
             // ensure retries with the old connection timeout semantics work.
-            RetryPrxPtr retryWithTimeout = retry1->ice_invocationTimeout(-2)->ice_timeout(200);
+            RetryPrxPtr retryWithTimeout = retry1->ice_invocationTimeout(-2)->ice_timeout(100);
             try
             {
-                retryWithTimeout->sleep(500);
+                retryWithTimeout->sleep(1000);
                 test(false);
             }
             catch(const Ice::TimeoutException&)

diff --git a/csharp/test/Ice/retry/AllTests.cs b/csharp/test/Ice/retry/AllTests.cs
@@ -279,10 +279,10 @@ static public Test.RetryPrx
                         // important here is to make sure there are 4 retries and that no calls succeed to
                         // ensure retries with the old connection timeout semantics work.
                         Test.RetryPrx retryWithTimeout =
-                            (Test.RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
+                            (Test.RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(100);
                         try
                         {
-                            retryWithTimeout.sleep(500);
+                            retryWithTimeout.sleep(1000);
                             test(false);
                         }
                         catch(Ice.TimeoutException)

diff --git a/java-compat/test/src/main/java/test/Ice/retry/AllTests.java b/java-compat/test/src/main/java/test/Ice/retry/AllTests.java
@@ -311,10 +311,10 @@ private static class AMIException extends Callback_Retry_op
                 // The timeout might occur on connection establishment or because of the sleep. What's
                 // important here is to make sure there are 4 retries and that no calls succeed to
                 // ensure retries with the old connection timeout semantics work.
-                RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
+                RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(100);
                 try
                 {
-                    retryWithTimeout.sleep(500);
+                    retryWithTimeout.sleep(1000);
                     test(false);
                 }
                 catch(Ice.TimeoutException ex)

diff --git a/java/test/src/main/java/test/Ice/retry/AllTests.java b/java/test/src/main/java/test/Ice/retry/AllTests.java
@@ -275,10 +275,10 @@ public static RetryPrx allTests(test.TestHelper helper,
                 // The timeout might occur on connection establishment or because of the sleep. What's
                 // important here is to make sure there are 4 retries and that no calls succeed to
                 // ensure retries with the old connection timeout semantics work.
-                RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
+                RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(100);
                 try
                 {
-                    retryWithTimeout.sleep(500);
+                    retryWithTimeout.sleep(1000);
                     test(false);
                 }
                 catch(com.zeroc.Ice.TimeoutException ex)

diff --git a/swift/test/Ice/retry/AllTests.swift b/swift/test/Ice/retry/AllTests.swift
@@ -112,12 +112,11 @@ public func allTests(helper: TestHelper, communicator2: Ice.Communicator, ref: S
         // The timeout might occur on connection establishment or because of the sleep. What's
         // important here is to make sure there are 4 retries and that no calls succeed to
         // ensure retries with the old connection timeout semantics work.
-        let retryWithTimeout = retry1.ice_invocationTimeout(-2).ice_timeout(200)
+        let retryWithTimeout = retry1.ice_invocationTimeout(-2).ice_timeout(100)
         do {
-            try retryWithTimeout.sleep(500)
+            try retryWithTimeout.sleep(1000)
             try test(false)
-        } catch is Ice.TimeoutException {
-        }
+        } catch is Ice.TimeoutException {}
     }
     output.writeLine("ok")
     return retry1