diff options
author | Jose <jose@zeroc.com> | 2014-11-07 16:41:46 +0100 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-11-07 16:41:46 +0100 |
commit | 132febee3f227db3b24e28404ba08dfde37a80e2 (patch) | |
tree | 3f4a76e6446a5d904cfd143c93773b02c3a67b5d /cpp | |
parent | ICE-5827 - Added type checks to ensure Node.Buffer or Uint8Array (diff) | |
download | ice-132febee3f227db3b24e28404ba08dfde37a80e2.tar.bz2 ice-132febee3f227db3b24e28404ba08dfde37a80e2.tar.xz ice-132febee3f227db3b24e28404ba08dfde37a80e2.zip |
ICE-5837 - test failures with C++/SSL
* Just C++ rhel6 test
Diffstat (limited to 'cpp')
-rw-r--r-- | cpp/test/Ice/ami/Client.cpp | 1 | ||||
-rw-r--r-- | cpp/test/Ice/timeout/AllTests.cpp | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp index fa982d492ec..28716861c57 100644 --- a/cpp/test/Ice/ami/Client.cpp +++ b/cpp/test/Ice/ami/Client.cpp @@ -34,6 +34,7 @@ main(int argc, char* argv[]) Ice::InitializationData initData; initData.properties = Ice::createProperties(argc, argv); initData.properties->setProperty("Ice.Warn.AMICallback", "0"); + initData.properties->setProperty("Ice.TCP.SndSize", "1024"); communicator = Ice::initialize(argc, argv, initData); status = run(argc, argv, communicator); diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp index f3866356dac..203bbb85145 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(500); + to->holdAdapter(2000); 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(1000); + to->holdAdapter(2000); 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(1000)); - to->holdAdapter(500); + to = TimeoutPrx::checkedCast(to->ice_timeout(3000)); + to->holdAdapter(2000); try { to->sendData(seq); |