diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2019-08-29 17:54:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2019-08-29 17:54:08 +0200 |
| commit | 1cd5fdc5aac9e6d718ee25177c4524f125736235 (patch) | |
| tree | d47957f4158fa07b622ec11e93a4fda035daf468 /cpp/test | |
| parent | Fixed whitespace (diff) | |
| download | ice-1cd5fdc5aac9e6d718ee25177c4524f125736235.tar.bz2 ice-1cd5fdc5aac9e6d718ee25177c4524f125736235.tar.xz ice-1cd5fdc5aac9e6d718ee25177c4524f125736235.zip | |
Minor timeout test fix to prevent failure, fixes #498
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index b7fd8643344..b6bde584ec2 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -522,28 +522,9 @@ allTestsWithController(Test::TestHelper* helper, const ControllerPrxPtr& control // Keep the server thread pool busy. #ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleepAsync(300); + timeout->ice_invocationTimeout(-1)->sleepAsync(500); #else - timeout->ice_invocationTimeout(-1)->begin_sleep(300); -#endif - try - { - batchTimeout->ice_flushBatchRequests(); - test(false); - } - catch(const Ice::InvocationTimeoutException&) - { - } - - batchTimeout->ice_ping(); - batchTimeout->ice_ping(); - batchTimeout->ice_ping(); - - // Keep the server thread pool busy. -#ifdef ICE_CPP11_MAPPING - timeout->ice_invocationTimeout(-1)->sleepAsync(300); -#else - timeout->ice_invocationTimeout(-1)->begin_sleep(300); + timeout->ice_invocationTimeout(-1)->begin_sleep(500); #endif try { |