diff options
Diffstat (limited to 'objective-c')
| -rw-r--r-- | objective-c/test/Ice/timeout/AllTests.m | 18 | ||||
| -rw-r--r-- | objective-c/test/Ice/timeout/Client.m | 6 | ||||
| -rw-r--r-- | objective-c/test/Ice/timeout/Server.m | 7 |
3 files changed, 22 insertions, 9 deletions
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", |