diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 11:22:03 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-09-16 11:22:03 +0200 |
| commit | 6cf8d1219c6bd00b025bbcc6fd1dcc23a75a9382 (patch) | |
| tree | a9dbba9da26aa376a966ed2b4ed77f8822ec35cd /cpp | |
| parent | Test was launching wrong icebox with GCC 6 (diff) | |
| download | ice-6cf8d1219c6bd00b025bbcc6fd1dcc23a75a9382.tar.bz2 ice-6cf8d1219c6bd00b025bbcc6fd1dcc23a75a9382.tar.xz ice-6cf8d1219c6bd00b025bbcc6fd1dcc23a75a9382.zip | |
Fixed for timeout bugs (ICE-7358, ICE-7243, Ice-7227)
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index eddba592074..31ab4c6c63b 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -417,10 +417,10 @@ allTests(const Ice::CommunicatorPtr& communicator) initData.properties->setProperty("Ice.Override.CloseTimeout", "100"); Ice::CommunicatorPtr comm = Ice::initialize(initData); Ice::ConnectionPtr connection = comm->stringToProxy(sref)->ice_getConnection(); - timeout->holdAdapter(500); + timeout->holdAdapter(800); IceUtil::Time now = IceUtil::Time::now(); comm->destroy(); - test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(400)); + test(IceUtil::Time::now() - now < IceUtil::Time::milliSeconds(700)); } cout << "ok" << endl; @@ -435,7 +435,7 @@ allTests(const Ice::CommunicatorPtr& communicator) timeout = timeout->ice_invocationTimeout(100); try { - timeout->sleep(300); + timeout->sleep(500); test(false); } catch(const Ice::InvocationTimeoutException&) @@ -445,9 +445,9 @@ allTests(const Ice::CommunicatorPtr& communicator) try { #ifdef ICE_CPP11_MAPPING - timeout->sleepAsync(300).get(); + timeout->sleepAsync(500).get(); #else - timeout->end_sleep(timeout->begin_sleep(300)); + timeout->end_sleep(timeout->begin_sleep(500)); #endif test(false); } |