diff options
author | Jose <jose@zeroc.com> | 2014-11-12 11:51:11 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-11-12 11:51:11 +0100 |
commit | ec0147c729bdba4ce8b2831fe4dd37e7f2aaaecd (patch) | |
tree | 420c75d3b7857ab6256532e49f63f0bf99e78c4e /cpp/test/Ice/timeout/AllTests.cpp | |
parent | Fixed (ICE-5881) - OpenSSL locks callback assertion (diff) | |
download | ice-ec0147c729bdba4ce8b2831fe4dd37e7f2aaaecd.tar.bz2 ice-ec0147c729bdba4ce8b2831fe4dd37e7f2aaaecd.tar.xz ice-ec0147c729bdba4ce8b2831fe4dd37e7f2aaaecd.zip |
Fixed (ICE-5837) test failures with C++/SSL
* Enabled OpenSSL partial writes and revert test changes
Diffstat (limited to 'cpp/test/Ice/timeout/AllTests.cpp')
-rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index 203bbb85145..0760dc947fc 100644 --- a/cpp/test/Ice/timeout/AllTests.cpp +++ b/cpp/test/Ice/timeout/AllTests.cpp @@ -136,7 +136,7 @@ allTests(const Ice::CommunicatorPtr& communicator) // Expect TimeoutException. // TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_timeout(250)); - to->holdAdapter(2000); + to->holdAdapter(500); try { to->sendData(seq); @@ -294,7 +294,7 @@ allTests(const Ice::CommunicatorPtr& communicator) initData.properties->setProperty("Ice.Override.Timeout", "250"); Ice::CommunicatorPtr comm = Ice::initialize(initData); TimeoutPrx to = TimeoutPrx::checkedCast(comm->stringToProxy(sref)); - to->holdAdapter(2000); + to->holdAdapter(500); try { to->sendData(seq); @@ -308,8 +308,8 @@ allTests(const Ice::CommunicatorPtr& communicator) // Calling ice_timeout() should have no effect. // timeout->op(); // Ensure adapter is active. - to = TimeoutPrx::checkedCast(to->ice_timeout(3000)); - to->holdAdapter(2000); + to = TimeoutPrx::checkedCast(to->ice_timeout(1000)); + to->holdAdapter(500); try { to->sendData(seq); |