diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-06-04 14:55:05 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-06-04 14:55:05 +0200 |
| commit | 3ec25d7f4f4acfdada3ed564544ff360980ec395 (patch) | |
| tree | 210a1b2d7da8f2f51a8c9da032503030369c7b50 /cpp | |
| parent | Fixed ICE-6558 - Android deadlock with background IO thread (diff) | |
| download | ice-3ec25d7f4f4acfdada3ed564544ff360980ec395.tar.bz2 ice-3ec25d7f4f4acfdada3ed564544ff360980ec395.tar.xz ice-3ec25d7f4f4acfdada3ed564544ff360980ec395.zip | |
Timeout test updates fix iPhone test failures (TCH-240)
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 8cfa598e86e..e10ac8258c5 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -213,7 +213,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // // Backward compatible connection timeouts // - TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_invocationTimeout(-2)->ice_timeout(100)); + TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_invocationTimeout(-2)->ice_timeout(250)); Ice::ConnectionPtr con; try { @@ -259,9 +259,9 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "testing close timeout... " << flush; { - TimeoutPrx to = TimeoutPrx::checkedCast(obj->ice_timeout(100)); + TimeoutPrx to = TimeoutPrx::checkedCast(obj->ice_timeout(250)); Ice::ConnectionPtr connection = to->ice_getConnection(); - timeout->holdAdapter(500); + timeout->holdAdapter(600); connection->close(false); try { @@ -271,7 +271,7 @@ allTests(const Ice::CommunicatorPtr& communicator) { test(false); } - IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500)); + IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(650)); try { connection->getInfo(); @@ -293,7 +293,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); - initData.properties->setProperty("Ice.Override.Timeout", "100"); + initData.properties->setProperty("Ice.Override.Timeout", "250"); Ice::CommunicatorPtr comm = Ice::initialize(initData); TimeoutPrx to = TimeoutPrx::checkedCast(comm->stringToProxy(sref)); timeout->holdAdapter(700); @@ -362,7 +362,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Verify that timeout set via ice_timeout() is still used for requests. // timeout->op(); // Ensure adapter is active. - to = TimeoutPrx::uncheckedCast(to->ice_timeout(100)); + to = TimeoutPrx::uncheckedCast(to->ice_timeout(250)); to->ice_getConnection(); // Establish connection timeout->holdAdapter(750); try @@ -382,7 +382,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Ice::InitializationData initData; initData.properties = communicator->getProperties()->clone(); - initData.properties->setProperty("Ice.Override.CloseTimeout", "100"); + initData.properties->setProperty("Ice.Override.CloseTimeout", "250"); Ice::CommunicatorPtr comm = Ice::initialize(initData); Ice::ConnectionPtr connection = comm->stringToProxy(sref)->ice_getConnection(); timeout->holdAdapter(500); |