diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-12-12 10:43:47 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-12-12 10:43:47 +0100 |
| commit | c60fa3d144434ad189f24866ac120425b76f4727 (patch) | |
| tree | d385504629f784d76b2652f335af1129b6a72b99 /cpp | |
| parent | Fixed ICE-6142: oneway batch operations didn't throw (diff) | |
| download | ice-c60fa3d144434ad189f24866ac120425b76f4727.tar.bz2 ice-c60fa3d144434ad189f24866ac120425b76f4727.tar.xz ice-c60fa3d144434ad189f24866ac120425b76f4727.zip | |
Fixed ICE-6073 - background test failure on Ubuntu
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/test/Ice/background/AllTests.cpp | 13 | ||||
| -rw-r--r-- | cpp/test/Ice/background/Client.cpp | 7 | ||||
| -rw-r--r-- | cpp/test/Ice/background/Server.cpp | 7 |
3 files changed, 15 insertions, 12 deletions
diff --git a/cpp/test/Ice/background/AllTests.cpp b/cpp/test/Ice/background/AllTests.cpp index c853c2485d6..32eec87e6bd 100644 --- a/cpp/test/Ice/background/AllTests.cpp +++ b/cpp/test/Ice/background/AllTests.cpp @@ -1192,7 +1192,7 @@ readWriteTests(const ConfigurationPtr& configuration, ctl->holdAdapter(); // Hold to block in request send. Ice::ByteSeq seq; - seq.resize(1024 * 1024); // Make sure the request doesn't compress too well. + seq.resize(1024); // Make sure the request doesn't compress too well. for(Ice::ByteSeq::iterator p = seq.begin(); p != seq.end(); ++p) { *p = static_cast<Ice::Byte>(IceUtilInternal::random(255)); @@ -1201,9 +1201,14 @@ readWriteTests(const ConfigurationPtr& configuration, Callback_Background_opWithPayloadPtr callbackWP = newCallback_Background_opWithPayload(cb, &OpAMICallback::noResponse, &OpAMICallback::noException); - while(backgroundOneway->begin_opWithPayload(seq, callbackWP)->sentSynchronously()) - { - } + + // + // Fill up the receive and send buffers, stop when we're not + // sending synchronously anymore (an indication that the buffers + // are full). + // + while(backgroundOneway->begin_opWithPayload(seq, callbackWP)->sentSynchronously()); + Callback_Background_opPtr callback; cb = new OpAMICallback(); diff --git a/cpp/test/Ice/background/Client.cpp b/cpp/test/Ice/background/Client.cpp index f143fbb6400..f10b812fbeb 100644 --- a/cpp/test/Ice/background/Client.cpp +++ b/cpp/test/Ice/background/Client.cpp @@ -47,10 +47,9 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.MessageSizeMax", "50000"); - // - // Workaround for OpenSSL SSL_write non blocking - // - initData.properties->setProperty("Ice.TCP.SndSize", "256000"); + // This test relies on filling the TCP send/recv buffer, so + // we rely on a fixed value for these buffers. + initData.properties->setProperty("Ice.TCP.SndSize", "50000"); // // Setup the test transport plug-in. diff --git a/cpp/test/Ice/background/Server.cpp b/cpp/test/Ice/background/Server.cpp index e922ef0977c..55fb0c228a8 100644 --- a/cpp/test/Ice/background/Server.cpp +++ b/cpp/test/Ice/background/Server.cpp @@ -135,10 +135,9 @@ main(int argc, char* argv[]) initData.properties->setProperty("Ice.MessageSizeMax", "50000"); - // - // Workaround for OpenSSL SSL_write non blocking - // - initData.properties->setProperty("Ice.TCP.RcvSize", "256000"); + // This test relies on filling the TCP send/recv buffer, so + // we rely on a fixed value for these buffers. + initData.properties->setProperty("Ice.TCP.RcvSize", "50000"); // // Setup the test transport plug-in. |