diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2020-05-15 14:30:57 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2020-05-15 14:30:57 +0200 |
| commit | 827fb617431b61f1fe811139f7b7f33beb45dbf0 (patch) | |
| tree | 5654bd897a56c3487d0bb4cea7ae7bd5c0b4c7d7 | |
| parent | Added synchronization for _sessions data member, fixes #843 (diff) | |
| download | ice-3.7.4.tar.bz2 ice-3.7.4.tar.xz ice-3.7.4.zip | |
Bumped sleep time and decreased timeout, fixes #850v3.7.4
| -rw-r--r-- | cpp/test/Ice/retry/AllTests.cpp | 4 | ||||
| -rw-r--r-- | csharp/test/Ice/retry/AllTests.cs | 4 | ||||
| -rw-r--r-- | java-compat/test/src/main/java/test/Ice/retry/AllTests.java | 4 | ||||
| -rw-r--r-- | java/test/src/main/java/test/Ice/retry/AllTests.java | 4 | ||||
| -rw-r--r-- | swift/test/Ice/retry/AllTests.swift | 7 |
5 files changed, 11 insertions, 12 deletions
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp index 4aeef33bf9c..acd15767691 100644 --- 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 index e6c45956770..0b039a395b3 100644 --- a/csharp/test/Ice/retry/AllTests.cs +++ b/csharp/test/Ice/retry/AllTests.cs @@ -279,10 +279,10 @@ namespace Ice // 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 index 6de38d1780a..2b0aa61c567 100644 --- 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 @@ public class AllTests // 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 index 29be55bc01f..3d155ff9d3d 100644 --- 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 class AllTests // 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 index c77f48e9454..ba1eb1bf5c2 100644 --- 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 |