Fixed (ICE-5837) test failures with C++/SSL

* Enabled OpenSSL partial writes and revert test changes

2 files changed, 4 insertions, 5 deletions

diff --git a/cpp/test/Ice/ami/Client.cpp b/cpp/test/Ice/ami/Client.cpp
index c2d38000552..fa982d492ec 100644
--- a/cpp/test/Ice/ami/Client.cpp
+++ b/cpp/test/Ice/ami/Client.cpp
@@ -34,7 +34,6 @@ 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", "8192");
 
         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 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);