summaryrefslogtreecommitdiff
path: root/objective-c
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-16 16:57:19 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-16 16:57:19 +0200
commitd5e9e136ab153a87d5c4eeb1193039f9d798b68b (patch)
tree0beade5737e008fdf5370e3aed7f3da930740134 /objective-c
parentFixed ICE-7871 - Bumped php invocation timeout (diff)
downloadice-d5e9e136ab153a87d5c4eeb1193039f9d798b68b.tar.bz2
ice-d5e9e136ab153a87d5c4eeb1193039f9d798b68b.tar.xz
ice-d5e9e136ab153a87d5c4eeb1193039f9d798b68b.zip
Fixed ICE-7872 - Objective-C Ice/timeout test failure
Diffstat (limited to 'objective-c')
-rw-r--r--objective-c/test/Ice/timeout/AllTests.m15
1 files changed, 14 insertions, 1 deletions
diff --git a/objective-c/test/Ice/timeout/AllTests.m b/objective-c/test/Ice/timeout/AllTests.m
index dad5c53c861..f3d5ff6c101 100644
--- a/objective-c/test/Ice/timeout/AllTests.m
+++ b/objective-c/test/Ice/timeout/AllTests.m
@@ -283,7 +283,7 @@ timeoutAllTests(id<ICECommunicator> communicator)
//
[timeout op]; // Ensure adapter is active.
to = [TestTimeoutTimeoutPrx checkedCast:[to ice_timeout:1000]];
- [timeout holdAdapter:1000];
+ [timeout holdAdapter:500];
@try
{
[to sendData:seq];
@@ -334,6 +334,19 @@ timeoutAllTests(id<ICECommunicator> communicator)
//
[timeout op]; // Ensure adapter is active.
to = [TestTimeoutTimeoutPrx uncheckedCast:[to ice_timeout:250]];
+ int nRetry = 5;
+ while(--nRetry > 0)
+ {
+ @try
+ {
+ [to ice_getConnection]; // Establish connection
+ break;
+ }
+ @catch(ICEConnectTimeoutException*)
+ {
+ // Can sporadically occur with slow machines
+ }
+ }
[to ice_getConnection]; // Establish connection
[timeout holdAdapter:1000];
@try