summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2020-05-20 09:40:20 +0200
committerBenoit Foucher <benoit@zeroc.com>2020-05-20 09:40:20 +0200
commit3842849d49c1f9190adfec65479cf81ea3808534 (patch)
tree051855bb1497e23e4b3fd9ce44dd0fbb64377aff
parentBumped sleep time and decreased timeout, fixes #850 (diff)
downloadice-3842849d49c1f9190adfec65479cf81ea3808534.tar.bz2
ice-3842849d49c1f9190adfec65479cf81ea3808534.tar.xz
ice-3842849d49c1f9190adfec65479cf81ea3808534.zip
Reverted the lower timeout for the invocation retry test, fix for #859
-rw-r--r--cpp/test/Ice/retry/AllTests.cpp2
-rw-r--r--csharp/test/Ice/retry/AllTests.cs2
-rw-r--r--java-compat/test/src/main/java/test/Ice/retry/AllTests.java2
-rw-r--r--java/test/src/main/java/test/Ice/retry/AllTests.java2
-rw-r--r--swift/test/Ice/retry/AllTests.swift2
5 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/retry/AllTests.cpp b/cpp/test/Ice/retry/AllTests.cpp
index acd15767691..fe64632f5ab 100644
--- a/cpp/test/Ice/retry/AllTests.cpp
+++ b/cpp/test/Ice/retry/AllTests.cpp
@@ -360,7 +360,7 @@ 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(100);
+ RetryPrxPtr retryWithTimeout = retry1->ice_invocationTimeout(-2)->ice_timeout(200);
try
{
retryWithTimeout->sleep(1000);
diff --git a/csharp/test/Ice/retry/AllTests.cs b/csharp/test/Ice/retry/AllTests.cs
index 0b039a395b3..27e465f9dde 100644
--- a/csharp/test/Ice/retry/AllTests.cs
+++ b/csharp/test/Ice/retry/AllTests.cs
@@ -279,7 +279,7 @@ 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(100);
+ (Test.RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
try
{
retryWithTimeout.sleep(1000);
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 2b0aa61c567..a0f80fafeea 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,7 +311,7 @@ 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(100);
+ RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
try
{
retryWithTimeout.sleep(1000);
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 3d155ff9d3d..d8ef59539a0 100644
--- a/java/test/src/main/java/test/Ice/retry/AllTests.java
+++ b/java/test/src/main/java/test/Ice/retry/AllTests.java
@@ -275,7 +275,7 @@ 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(100);
+ RetryPrx retryWithTimeout = (RetryPrx)retry1.ice_invocationTimeout(-2).ice_timeout(200);
try
{
retryWithTimeout.sleep(1000);
diff --git a/swift/test/Ice/retry/AllTests.swift b/swift/test/Ice/retry/AllTests.swift
index ba1eb1bf5c2..8283968b3f2 100644
--- a/swift/test/Ice/retry/AllTests.swift
+++ b/swift/test/Ice/retry/AllTests.swift
@@ -112,7 +112,7 @@ 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(100)
+ let retryWithTimeout = retry1.ice_invocationTimeout(-2).ice_timeout(200)
do {
try retryWithTimeout.sleep(1000)
try test(false)