summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/test/Ice/timeout/AllTests.cpp14
-rw-r--r--objective-c/test/Ice/timeout/AllTests.m18
-rw-r--r--objective-c/test/Ice/timeout/Client.m6
-rw-r--r--objective-c/test/Ice/timeout/Server.m7
4 files changed, 29 insertions, 16 deletions
diff --git a/cpp/test/Ice/timeout/AllTests.cpp b/cpp/test/Ice/timeout/AllTests.cpp
index 8cfa598e86e..e10ac8258c5 100644
--- a/cpp/test/Ice/timeout/AllTests.cpp
+++ b/cpp/test/Ice/timeout/AllTests.cpp
@@ -213,7 +213,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
//
// Backward compatible connection timeouts
//
- TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_invocationTimeout(-2)->ice_timeout(100));
+ TimeoutPrx to = TimeoutPrx::uncheckedCast(obj->ice_invocationTimeout(-2)->ice_timeout(250));
Ice::ConnectionPtr con;
try
{
@@ -259,9 +259,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
cout << "testing close timeout... " << flush;
{
- TimeoutPrx to = TimeoutPrx::checkedCast(obj->ice_timeout(100));
+ TimeoutPrx to = TimeoutPrx::checkedCast(obj->ice_timeout(250));
Ice::ConnectionPtr connection = to->ice_getConnection();
- timeout->holdAdapter(500);
+ timeout->holdAdapter(600);
connection->close(false);
try
{
@@ -271,7 +271,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
{
test(false);
}
- IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500));
+ IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(650));
try
{
connection->getInfo();
@@ -293,7 +293,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
//
Ice::InitializationData initData;
initData.properties = communicator->getProperties()->clone();
- initData.properties->setProperty("Ice.Override.Timeout", "100");
+ initData.properties->setProperty("Ice.Override.Timeout", "250");
Ice::CommunicatorPtr comm = Ice::initialize(initData);
TimeoutPrx to = TimeoutPrx::checkedCast(comm->stringToProxy(sref));
timeout->holdAdapter(700);
@@ -362,7 +362,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
// Verify that timeout set via ice_timeout() is still used for requests.
//
timeout->op(); // Ensure adapter is active.
- to = TimeoutPrx::uncheckedCast(to->ice_timeout(100));
+ to = TimeoutPrx::uncheckedCast(to->ice_timeout(250));
to->ice_getConnection(); // Establish connection
timeout->holdAdapter(750);
try
@@ -382,7 +382,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
//
Ice::InitializationData initData;
initData.properties = communicator->getProperties()->clone();
- initData.properties->setProperty("Ice.Override.CloseTimeout", "100");
+ initData.properties->setProperty("Ice.Override.CloseTimeout", "250");
Ice::CommunicatorPtr comm = Ice::initialize(initData);
Ice::ConnectionPtr connection = comm->stringToProxy(sref)->ice_getConnection();
timeout->holdAdapter(500);
diff --git a/objective-c/test/Ice/timeout/AllTests.m b/objective-c/test/Ice/timeout/AllTests.m
index bd686cb1c22..29a5ee5eb3d 100644
--- a/objective-c/test/Ice/timeout/AllTests.m
+++ b/objective-c/test/Ice/timeout/AllTests.m
@@ -133,8 +133,8 @@ timeoutAllTests(id<ICECommunicator> communicator)
//
// Expect TimeoutException.
//
- id<TestTimeoutTimeoutPrx> to = [TestTimeoutTimeoutPrx uncheckedCast:[obj ice_timeout:100]];
- [to holdAdapter:500];
+ id<TestTimeoutTimeoutPrx> to = [TestTimeoutTimeoutPrx uncheckedCast:[obj ice_timeout:250]];
+ [to holdAdapter:1000];
@try
{
[to sendData:seq];
@@ -214,12 +214,12 @@ timeoutAllTests(id<ICECommunicator> communicator)
// Backward compatible connection timeouts
//
id<TestTimeoutTimeoutPrx> to =
- [TestTimeoutTimeoutPrx uncheckedCast:[[obj ice_invocationTimeout:-2] ice_timeout:100]];
+ [TestTimeoutTimeoutPrx uncheckedCast:[[obj ice_invocationTimeout:-2] ice_timeout:250]];
id<ICEConnection> con;
@try
{
con = [to ice_getConnection];
- [to sleep:250];
+ [to sleep:500];
test(NO);
}
@catch(ICETimeoutException*)
@@ -266,10 +266,10 @@ timeoutAllTests(id<ICECommunicator> communicator)
//
ICEInitializationData* initData = [ICEInitializationData initializationData];
[initData setProperties:[[communicator getProperties] clone]];
- [[initData properties] setProperty:@"Ice.Override.Timeout" value:@"100"];
+ [[initData properties] setProperty:@"Ice.Override.Timeout" value:@"250"];
id<ICECommunicator> comm = [ICEUtil createCommunicator:initData];
id<TestTimeoutTimeoutPrx> to = [TestTimeoutTimeoutPrx checkedCast:[comm stringToProxy:sref]];
- [timeout holdAdapter:500];
+ [timeout holdAdapter:1000];
@try
{
[to sendData:seq];
@@ -284,7 +284,7 @@ timeoutAllTests(id<ICECommunicator> communicator)
//
[timeout op]; // Ensure adapter is active.
to = [TestTimeoutTimeoutPrx checkedCast:[to ice_timeout:1000]];
- [timeout holdAdapter:500];
+ [timeout holdAdapter:1000];
@try
{
[to sendData:seq];
@@ -334,9 +334,9 @@ timeoutAllTests(id<ICECommunicator> communicator)
// Verify that timeout set via ice_timeout() is still used for requests.
//
[timeout op]; // Ensure adapter is active.
- to = [TestTimeoutTimeoutPrx uncheckedCast:[to ice_timeout:100]];
+ to = [TestTimeoutTimeoutPrx uncheckedCast:[to ice_timeout:250]];
[to ice_getConnection]; // Establish connection
- [timeout holdAdapter:750];
+ [timeout holdAdapter:1000];
@try
{
[to sendData:seq];
diff --git a/objective-c/test/Ice/timeout/Client.m b/objective-c/test/Ice/timeout/Client.m
index fcebbd09aa8..bf9c542f5b5 100644
--- a/objective-c/test/Ice/timeout/Client.m
+++ b/objective-c/test/Ice/timeout/Client.m
@@ -48,6 +48,12 @@ main(int argc, char* argv[])
[initData.properties setProperty:@"Ice.Override.ConnectTimeout" value:@""];
//
+ // Limit the send buffer size, this test relies on the socket
+ // send() blocking after sending a given amount of data.
+ //
+ [initData.properties setProperty:@"Ice.TCP.SndSize" value:@"50000"];
+
+ //
// This test kills connections, so we don't want warnings.
//
[initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
diff --git a/objective-c/test/Ice/timeout/Server.m b/objective-c/test/Ice/timeout/Server.m
index 2922e85d83f..9465b8a8f61 100644
--- a/objective-c/test/Ice/timeout/Server.m
+++ b/objective-c/test/Ice/timeout/Server.m
@@ -52,6 +52,13 @@ main(int argc, char* argv[])
// This test kills connections, so we don't want warnings.
//
[initData.properties setProperty:@"Ice.Warn.Connections" value:@"0"];
+
+ //
+ // Limit the send buffer size, this test relies on the socket
+ // send() blocking after sending a given amount of data.
+ //
+ [initData.properties setProperty:@"Ice.TCP.RcvSize" value:@"50000"];
+
#if TARGET_OS_IPHONE
initData.prefixTable__ = [NSDictionary dictionaryWithObjectsAndKeys:
@"TestTimeout", @"::Test",
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:45:53 +0000